diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
index 1cae0263220c..bac57a0b7e4f 100644
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="pam selinux"
 
 RDEPEND="sys-libs/libnih[dbus]
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
index 012278f2d738..64af3dd795ef 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -126,8 +126,9 @@ REQUIRED_USE="
 	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.4.1"-{libocci,lt}.patch
-	"${FILESDIR}/${PN}-4.10.3"-werror.patch
+	"${FILESDIR}/${PN}-5.4.1-libocci.patch"
+	"${FILESDIR}/${PN}-5.5.0-lt.patch"
+	"${FILESDIR}/${PN}-4.10.3-werror.patch"
 )
 
 # @FUNCTION: collectd_plugin_kernel_linux
@@ -220,7 +221,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	epatch ${PATCHES[@]}
 	epatch_user
 
 	# There's some strange prefix handling in the default config file, resulting in
diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch
new file mode 100644
index 000000000000..b14736bf2667
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch
@@ -0,0 +1,35 @@
+diff --git Makefile.am Makefile.am
+index 5267123..a7e0d0c 100644
+--- Makefile.am
++++ Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+--- configure.ac.old	2016-01-04 13:55:39.286846436 +0400
++++ configure.ac	2016-01-04 13:56:07.905362298 +0400
+@@ -2,12 +2,10 @@
+ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
+ AC_CONFIG_SRCDIR(src/)
+ AC_CONFIG_HEADERS(src/config.h)
+-AC_CONFIG_AUX_DIR([libltdl/config])
+ 
+ m4_ifdef([LT_PACKAGE_VERSION],
+ 	# libtool >= 2.2
+ 	[
+-	 LT_CONFIG_LTDL_DIR([libltdl])
+ 	 LT_INIT([dlopen])
+ 	 LTDL_INIT([convenience])
+ 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -19,7 +17,6 @@
+ 	 AC_SUBST(LTDLINCL)
+ 	 AC_SUBST(LIBLTDL)
+ 	 AC_LIBTOOL_DLOPEN
+-	 AC_CONFIG_SUBDIRS(libltdl)
+ 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ 	]
+ )
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 503421568d35..079816aa8fd1 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -234,3 +234,4 @@
 "WDC WD7500BFCX-68N6GN0"					194 C "Western Digital Red 750GB SATA"
 "Hitachi HTS547575A9E384"					190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
 "WDC WD30PURX-64P6ZY0"						194 C "Western Digital Purple 3TB 64MB Cache"
+"WDC WD10EZEX-00BN5A0"						194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index d5a10a1c6fd0..66a8d6fb54ab 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index a63ea63df605..c88633a4288c 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -11,12 +11,6 @@
 		<flag name="entropy">
 			Enable Entropy backend
 		</flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			Enable introspection
-		</flag>
-		<flag name="pm-utils">
-			Add pm-utils (suspend/resume) functionalities
-		</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
deleted file mode 100644
index 405764efdf22..000000000000
--- a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# 0.7.x is untested with Python 3.x
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python nsplugins bash-completion-r1
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev"
-
-CDEPEND="connman? ( net-misc/connman )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.9 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
-	nsplugin? (
-		>=dev-libs/nspr-4.8
-		x11-libs/cairo
-		>=x11-libs/gtk+-2.14.0:2
-		x11-libs/pango
-	)
-	policykit? ( >=sys-auth/polkit-0.98 )
-	udev? ( virtual/libgudev )
-	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.26.1:2
-	>=sys-apps/dbus-1.3.0"
-DEPEND="${CDEPEND}
-	doc? ( dev-util/gtk-doc )
-	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	entropy? ( >=sys-apps/entropy-1.0_rc27 )
-	pm-utils? ( sys-power/pm-utils )
-	>=app-portage/layman-1.2.3
-	>=sys-apps/portage-2.1.9
-	sys-auth/consolekit"
-
-APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr
-ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE=" ${IUSE} linguas_${X}"
-done
-
-S="${WORKDIR}/${MY_P}"
-RESTRICT="test" # tests are failing atm
-
-# NOTES:
-# do not use a specific user, useless and not more secure according to upstream
-# doc is in the tarball and always installed
-# mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
-#	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
-# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
-# drop the npapi-api-change patch below and relax the dependency constraints
-
-# UPSTREAM:
-# documentation/website with --enable-doc-install
-# failing tests
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-sdk.patch #383141
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-}
-
-src_configure() {
-	local myconf=""
-
-	if use policykit; then
-		myconf+=" --with-security-framework=polkit"
-	else
-		myconf+=" --with-security-framework=dummy"
-	fi
-
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf+=" --disable-nls"
-	else
-		myconf+=" --enable-nls"
-	fi
-
-	# localstatedir: for gentoo it's /var/lib but for $PN it's /var
-	# dep-tracking,option-check,libtool-lock,strict,local: obvious reasons
-	# command,debuginfo,gstreamer,service-packs: not supported by backend
-
-	# NOTE: default backend is autodetected at runtime, also
-	if use entropy; then
-		myconf+=" --with-default-backend=entropy"
-	else
-		myconf+=" --with-default-backend=portage"
-	fi
-	econf \
-		${myconf} \
-		--enable-introspection=$(use introspection && echo -n "yes" || echo -n "no") \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		$(use_enable doc gtk-doc) \
-		--enable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--enable-man-pages \
-		--enable-portage \
-		$(use_enable entropy) \
-		$(use_enable cron) \
-		--disable-gtk-module \
-		$(use_enable introspection) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable connman) \
-		$(use_enable pm-utils) \
-		--disable-qt \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		$(use_enable udev device-rebind)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed"
-	dodoc ChangeLog || die "dodoc failed"
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name *.la | xargs rm || die "removing .la files failed"
-	fi
-
-	# Remove precompiled python modules, we handle byte compiling
-	rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
-
-	newbashcomp "${S}/contrib/pk-completion.bash" ${PN}
-	# Remove bashcomp file installed by build-system
-	rm -f "${D}/bash_completion.d/pk-completion.bash"
-
-	# Remove unwanted PackageKit website stuff
-	rm -rf "${D}/usr/share/PackageKit/website"
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN/-base}
-
-	if ! use policykit; then
-		ewarn "You are not using policykit, the daemon can't be considered as secure."
-		ewarn "All users will be able to do anything through ${MY_PN}."
-		ewarn "Please, consider rebuilding ${MY_PN} with policykit USE flag."
-		ewarn "THIS IS A SECURITY ISSUE."
-		echo
-	fi
-}
-
-pkg_prerm() {
-	einfo "Removing downloaded files with ${MY_PN}..."
-	[[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
-		rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN/-base}
-}
diff --git a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
new file mode 100644
index 000000000000..ff02f783d7a7
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 multilib nsplugins python-single-r1 systemd vala
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found +introspection networkmanager nsplugin entropy systemd test vala"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# to get current session's user.
+CDEPEND="
+	>=app-shells/bash-completion-2
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}]
+	>=sys-auth/polkit-0.98
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}
+	connman? ( net-misc/connman )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] )
+	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+	nsplugin? (
+		>=dev-libs/nspr-4.8
+		x11-libs/cairo
+		>=x11-libs/gtk+-2.14.0:2
+		x11-libs/pango
+	)
+	systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${CDEPEND}
+	>=app-portage/layman-2[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+	!systemd? ( sys-auth/consolekit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-gtk-module \
+		--disable-schemas-compile \
+		--disable-static \
+		--enable-bash-completion \
+		--enable-man-pages \
+		--enable-nls \
+		--enable-portage \
+		--localstatedir=/var \
+		$(use_enable command-not-found) \
+		$(use_enable connman) \
+		$(use_enable cron) \
+		$(use_enable entropy) \
+		$(use_enable introspection) \
+		$(use_enable networkmanager) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable systemd) \
+		$(use_enable test daemon-tests) \
+		$(use_enable vala) \
+		$(systemd_with_unitdir)
+		#$(use_enable test local)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --all
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die
+	fi
+}
diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest
index d5a10a1c6fd0..66a8d6fb54ab 100644
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
deleted file mode 100644
index b72fee37c8be..000000000000
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils base
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Gtk3 PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/pango
-	~app-admin/packagekit-base-${PV}"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-	econf \
-		--localstatedir=/var \
-		--enable-introspection=yes \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
-		--disable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--disable-man-pages \
-		--disable-cron \
-		--enable-gtk-module \
-		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--disable-qt
-}
-
-src_compile() {
-	cd "${S}"/contrib/gtk-module || die
-	emake || die "emake install failed"
-}
-
-src_install() {
-	cd "${S}"/contrib/gtk-module || die
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
new file mode 100644
index 000000000000..693d6d3ceae8
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/pango
+	~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--disable-bash-completion \
+		--disable-browser-plugin \
+		--disable-command-not-found \
+		--disable-cron \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-local \
+		--disable-man-pages \
+		--disable-networkmanager \
+		--disable-static \
+		--disable-systemd \
+		--disable-vala \
+		--enable-dummy \
+		--enable-gtk-module \
+		--enable-introspection=yes \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake -C contrib/gtk-module
+}
+
+src_install() {
+	emake -C contrib/gtk-module DESTDIR="${D}" install
+	prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-qt4/Manifest b/app-admin/packagekit-qt4/Manifest
index 9165b8578bd1..2873587f8e6f 100644
--- a/app-admin/packagekit-qt4/Manifest
+++ b/app-admin/packagekit-qt4/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-Qt-0.8.8.tar.xz 41416 SHA256 e234d4b1f8451821930f463621a86c9708eebfd1db65019883d38a60d13c870c SHA512 a81b85588f531ca58d355094a78c3f07aa804350fdd49f98fbae02076ebb1d4736c0a3d33822805a9e1b5ee5bf62e85141994b841c5e9218b7d03715b45dde11 WHIRLPOOL 319b2226fcf1a7de58df016b2cd401779601ad1842f0d35c9341f56d380397d9dc92a7cd8c8291fb0c4487f7821f4c860130b6275523a240bc3e8996d425f973
+DIST PackageKit-Qt-0.9.5.tar.xz 43312 SHA256 f4fb60b82d845d887de57ef44481301f966291912116e416d981156faf3620f0 SHA512 3dbe52d6e0f8ba17c9ef04acdb5e2c29d5630fbb60b3522e57895b2d409497a15a543ba87efd876111726b1785c6ed74ff663b5379ba053ccab492d0e3bc08e2 WHIRLPOOL 7ec050b0086496c84506af0282e577a1a08eb8cf1628e9b9d4f41e6924c7965188ed564f83ce14493df72e555ee30c3c77e9bd11df791434292bbc12d53e2b61
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
deleted file mode 100644
index 19b3e366eccf..000000000000
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils base
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt4 PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-qt/qtcore-4.4.0:4
-	>=dev-qt/qtdbus-4.4.0:4
-	>=dev-qt/qtsql-4.4.0:4
-	~app-admin/packagekit-base-${PV}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-	econf \
-		--enable-introspection=no \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
-		--disable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--disable-man-pages \
-		--disable-cron \
-		--disable-gtk-module \
-		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--enable-qt
-}
-
-src_compile() {
-	local qtdir=packagekit-qt2
-	cd "${S}"/lib/${qtdir} || die
-	emake || die "emake install failed"
-}
-
-src_install() {
-	local qtdir=packagekit-qt2
-	cd "${S}"/lib/${qtdir} || die
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild
new file mode 100644
index 000000000000..aee6956c82f7
--- /dev/null
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Qt4 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-4.4.0:4
+	>=dev-qt/qtdbus-4.4.0:4
+	>=dev-qt/qtsql-4.4.0:4
+	>=app-admin/packagekit-base-0.9
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/packagekit/packagekit-0.7.4.ebuild b/app-admin/packagekit/packagekit-1.0.11.ebuild
similarity index 68%
rename from app-admin/packagekit/packagekit-0.7.4.ebuild
rename to app-admin/packagekit/packagekit-1.0.11.ebuild
index 3f45d23adc04..f8c5af717e2d 100644
--- a/app-admin/packagekit/packagekit-0.7.4.ebuild
+++ b/app-admin/packagekit/packagekit-1.0.11.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
+EAPI="5"
 
 DESCRIPTION="PackageKit Package Manager interface (meta package)"
 HOMEPAGE="http://www.packagekit.org/"
 SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt4"
 
 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
-	qt4? ( ~app-admin/packagekit-qt4-${PV} )"
+	qt4? ( >=app-admin/packagekit-qt4-0.9 )"
 
 DEPEND="${RDEPEND}"
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
new file mode 100644
index 000000000000..f720394d4234
--- /dev/null
+++ b/app-admin/qtpass/Manifest
@@ -0,0 +1 @@
+DIST qtpass-1.0.5.tar.gz 636461 SHA256 0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281 SHA512 e1b63f1058dc9c194f06376d52acbbb8594d429f4d7fe4ba27baed2cafe10b1c36137b3e33626c1bf33c7f3e1444e6fbe48fc66a83e0f7cd82f5b47f0193d178 WHIRLPOOL acb914d89bcd667343f648e38bb9eb316ebbf0b01f75686d3a7694e82eedd3e3f52ffc99f530bbe3ccbb6089ced727796924fcf48a94c071a3e20b27141b28df
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
new file mode 100644
index 000000000000..6c4ad75441b5
--- /dev/null
+++ b/app-admin/qtpass/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<longdescription>
+QtPass is a multi-platform GUI for pass, the standard unix password manager.
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/IJHack/qtpass/releases</changelog>
+		<doc>https://github.com/IJHack/qtpass/wiki</doc>
+		<bugs-to>https://github.com/IJHack/qtpass/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/qtpass/qtpass-1.0.5.ebuild b/app-admin/qtpass/qtpass-1.0.5.ebuild
new file mode 100644
index 000000000000..ed2aa21369c0
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+qt5"
+DOCS=( FAQ.md README.md CONTRIBUTING.md )
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[xcb]
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	app-admin/pass"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+src_prepare() {
+	# Modify install path
+	sed -i "s/target.path = \$\$PREFIX/target.path = \$\$PREFIX\/bin/" \
+		${PN}.pro \
+		|| die "sed failed to modify install path for ${PN}.pro"
+
+	# Backport segfault fix https://github.com/IJHack/qtpass/issues/122
+	# (ToDo: remove this in 1.0.6)
+	sed -e "/QtPass = NULL;/{n;d};/startupPhase = true;/a autoclearTimer = NULL;" \
+		-i mainwindow.cpp || die "sed failed mainwindow.cpp"
+
+	epatch_user
+}
+
+src_configure() {
+	if use qt5 ; then
+		eqmake5 PREFIX="${D}"/usr
+	else
+		eqmake4 PREFIX="${D}"/usr
+	fi
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/applications
+	doins "${PN}.desktop"
+
+	newicon artwork/icon.svg "${PN}-icon.svg"
+}
diff --git a/app-backup/backintime/backintime-1.1.8-r1.ebuild b/app-backup/backintime/backintime-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..ce92e3352aaa
--- /dev/null
+++ b/app-backup/backintime/backintime-1.1.8-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+HOMEPAGE="http://backintime.le-web.org/"
+SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+RDEPEND="${DEPEND}
+	qt4? ( dev-python/PyQt4 )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#fix doc install location
+	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
+		-i common/configure || die
+	sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
+		-i qt4/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt4,common}/configure || die
+
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	cd "${S}"/common || die
+	./configure --python3 --no-fuse-group || die
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	if use qt4 ; then
+		cd "${S}"/qt4 || die
+		emake DESTDIR="${D}" install
+	fi
+
+	python_optimize "${D}"
+}
diff --git a/app-doc/abs-guide/Manifest b/app-doc/abs-guide/Manifest
index a9144176e3ff..eac221eabb3c 100644
--- a/app-doc/abs-guide/Manifest
+++ b/app-doc/abs-guide/Manifest
@@ -1,4 +1,2 @@
-DIST abs-guide-6.6.pdf 3348750 SHA256 dc3ab7f8cdd8516e8758dafb943d39ecee6ab289c171507ea4290478749bc970 SHA512 4338edbd19faf256bc857ecbb596f54a05a687583c4cadc76deb97fa50317c58a3b6b7833649b5209b78d32887d08776d8d2e0b0deaaa915e886505b5ead41c1 WHIRLPOOL 777745b854a3c92efaf94c5aa8206a1e19840a78546f39cfb8563015614bee1502f29a20e46510b8307f8f414478937126cd02807ae77cf3a9d3576c85cc9b47
-DIST abs-guide-6.6.tar.bz2 1136823 SHA256 922369ab87545c3ae3118122328508ad201a0893fc09ec474bb88e987777f07a SHA512 506590b8279f6719cbbaa18f4468b1f8b99f9ed3b490475426236fcfcc7a479552c579648d5475e047418de1e56e899288150586bf04ba8e1075a6040f50d7a9 WHIRLPOOL 2dd00b9c8915fa90fae37878c2b651b601a7ee52bd0f1b30dbb49a77574e57a92994e07efa77d6270154c80febb568d30a5110ad28cb51c19553a051aada9662
 DIST abs-guide-final.tar.bz2 1141871 SHA256 c29ffc8721ac2a8e0782bf0518d6a9dbd650f5a3deb00009b825f80f833aa971 SHA512 76c445da6faa47418e50458bf2bfc0b4c34c9efcc93308c39ec880b894d019bf9a1d2f4a8687d14bd9832872b666769f6f7f74c313520e9770f16724eb3adfdd WHIRLPOOL 831e6144ccfafd84725d1b961a9425c2c8bcddf07485453f8ff23cacef1244aa60e5a9532c7156170e617717c4c737fe715a951d7e73d14c5fcc1d79e05da415
 DIST abs-guide.pdf 3358210 SHA256 6fcd205205d5e549d9ed4dc2e9d620f8af5742917c2a718b32f91398f41155cd SHA512 8691ddab583e816ca9f0e42d37d45d8c27e74b5b62a5a951c7fe5830679e9288d4d5f98e7ff0746e2ac71e26322c7dc8250e33128b3e77591a1e48e8d415777c WHIRLPOOL 407a7c24ceaf98a64b721b0f1cca9c22acf115a6c50f47e54af95ddc2511bd1409cd4a88df21dfde88559e7428a413099e0b77986bbe368ace37a754a288ed2c
diff --git a/app-doc/abs-guide/abs-guide-6.6.ebuild b/app-doc/abs-guide/abs-guide-6.6.ebuild
deleted file mode 100644
index 1c7bbe9c322b..000000000000
--- a/app-doc/abs-guide/abs-guide-6.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="An advanced reference and a tutorial on bash shell scripting"
-HOMEPAGE="http://www.tldp.org/LDP/abs/html"
-
-# Upstream likes to update the tarballs without changing the names.
-# - http://bash.deta.in/abs-guide-${PV}.tar.bz2
-# - http://bash.deta.in/abs-guide.pdf <- remember to rename with ${PV}
-SRC_URI="https://dev.gentoo.org/~dirtyepic/dist/${P}.tar.bz2
-	pdf? ( https://dev.gentoo.org/~dirtyepic/dist/${P}.pdf )"
-
-LICENSE="OPL"
-IUSE="pdf"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/abs"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use pdf && cp "${DISTDIR}"/${P}.pdf "${S}"
-}
-
-src_install() {
-	dodoc -r *
-	docompress -x /usr/share/doc/${PF}
-}
diff --git a/app-doc/csound-manual/Manifest b/app-doc/csound-manual/Manifest
index 70819d0715d4..1d0dea27a062 100644
--- a/app-doc/csound-manual/Manifest
+++ b/app-doc/csound-manual/Manifest
@@ -1,15 +1,3 @@
-DIST Csound5.17_manual-fr_html.zip 9881142 SHA256 9c2a6639ee733329269f1474a60e0233aded2b9f11d1f183fd9602fc38d301f5 SHA512 c37f5e0062e5598c521518ccc4fa2ee3cc5d34ccb03081bc49a96c1b5cae8b45c57f14a7d07548dd4578f480128c0678740aaa5487c1210a790021589c76eb30 WHIRLPOOL a295461a94726b1304118b6f09c36bbc49c6e96ecb219aeb6bb6d1d3879b944033de33779197f70e708c5eb8abe79a01557c2efe4451e960249d1552dc368397
-DIST Csound5.17_manual-fr_pdf.zip 6044660 SHA256 03033ef48e570c89b6a2b4c70c1c29e379f5d09d0f5d98a24fe5bf1ee559164a SHA512 dcc2fe1b93f02e5e4a9a823bc870a40b82d601856344abe891c41a0ac2c9be2a8fe5a5693ff3fec62c332b454a04294f3ea4b2c318851a7bd9b85417345f881a WHIRLPOOL e5137cd2da3a4289056fe3e1ff8c754e40a5c407e16d66f6ea803bccc469af7a1f3f4af141a23876306749ee378d1640c0847e58dc15b04ab3e11da269917b86
-DIST Csound5.17_manual_html.zip 9621312 SHA256 cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626 SHA512 bbc6ae289031ab318d745d5bce257bfae40bda526d1afc407629a53836e03427b4d214ffda4268d41000fca255555a87705aa92ec3addc1a69621adb9802cfd1 WHIRLPOOL c129b7a76f8b4afc7d1ece4b7a4373dd5dbbcc9e6ac3b8c790067fbc62c9388648504a8d0561524500c1da60e7c333557dd7c889ff5d8f463893f4e5f1fcc2ac
-DIST Csound5.17_manual_pdf.zip 5736239 SHA256 72d3e416b1e2fa7d60d67f803083f86ec12a09a4af427713a5a6a10472f95ee8 SHA512 d2e337a4e38ccb3611498e72643a9cfcab252dd033ee6e0e23b7043188ed32993373c229efab23665745caf1cd9c7bb4b13feffe71c793a64afc09dd19011387 WHIRLPOOL af0b49d4c6d29d37af50b5862d6972753c53f6f8085ec3a33199bd6d054c08e857aab3b4d72391311f70e983622a2537ccb6c54ad8ff42febbf846be16a82263
-DIST Csound5.18_manual-fr_html.zip 10036889 SHA256 75bd9b4849421ea14ed4c1cc4d5834badda9bd4c4751939ce0216df11d5a89cf SHA512 14444b0c5295eb0486ca6e9a20d7b50f63e9f9d0ffaffe368bda47f2d3254472198323586b1a6b2c0538b5864d145b30119c3be25dd27ea28f303a71591d7e46 WHIRLPOOL 3ae854878d6a3fc8bd4e1fb91b39360012a8cdbe11a2e2df0324728041f6878e4d0bb7c8633596e8f2fd6f93f7cf49e7ab7a1aaba6e27ac1e6b707a4e5080f9d
-DIST Csound5.18_manual-fr_pdf.zip 6173894 SHA256 3ac80a17500ad20036fcfd2072336c2c44d944427f41204a0ab17d8f5f8b1de7 SHA512 dc8c8cd059cdac9f32da3cdea5b6c38a60313de345665f81b674b95f16b3dea0c8f4059f7ed65cac3a01404e555764a1a429cbf65211919418c779fefdf0ad6c WHIRLPOOL 6ead891ab9e5f7a89cb2a4654ca43b21756838e338a163530c465f7a11dd3c2c34b305084e9cb016d3de6a8c0cef19909b848f4e80cad962b4f8551e18bf0b2f
-DIST Csound5.18_manual_html.zip 9773269 SHA256 a7347bb1a6b5af3497de95a2df36217a6a42219e2f36a3d6d505cd53b2719cd4 SHA512 0da182ce37c1054adaa484b2f109b251a10f4d25ebc34f5c92015d3efc497107a1b7bcc2cbc76a9b0e5c7110d0ecb4fb1276de02b72ea2926ca2b6020ba5251d WHIRLPOOL c956f91245df50e860571524430f58cad9ec2e14c6b1611a07460be7dc81f0cb62b602687c1c0f87b52f67d6d3fe1ecececea3cab15123343f4255c99ac295bc
-DIST Csound5.18_manual_pdf.zip 5858707 SHA256 2b1f3fb94fe21143f133bc6005aab0749088b3d40ebd962da62ae09b885a62bb SHA512 dccb0b1aa9f04e29870108982884406c64d45f359f677e79b7e7729f57e869c07bf8854fb1a0d399d3c0c0784aa0fd67dbe9f6ca1e86335c2be03312485d7ba3 WHIRLPOOL 787c75ec80d583322234487b36c3ddd91e94c15842d477acb9f6f9a03481f9e0b3525ecda01da7305e7ebf4f5aaeb879cd00d6033393f1490dd68a02d4e5da60
-DIST Csound5.19_manual-fr_html.zip 10125804 SHA256 f11bfaeb286ff0dedf1008bf2d77538bb862b34d8ee9542fd8541afa1076371d SHA512 64dfc04c77687af92c62a8cfe7fe5098e6c41fc66c37c7ea11a96c2738553e28847079c3e1a0e0d71e075e834386f1f17c4bc2428afa4591251a6d9e995ff3ad WHIRLPOOL 008b5e83cfb510c4599cb1753783adf6c9a555ead96b48cbadd213a4d2388be404fdb06f888328f762778c3b7a06542ac96d4736c4eb92813601aaa1a4e38d38
-DIST Csound5.19_manual-fr_pdf.zip 6264056 SHA256 602be471db59d3b3e6042807e29c5c3fc1762123745b7668628a18dc02beeaff SHA512 8c7a9531534eb407ebbe8b4f4f1b7765d3fe2b4d66828c4de86c3b5b6fba7af6c68bbcfed00d4908ee92994f85e141b4b8bad909321c6bb2c70311bc06217fc3 WHIRLPOOL c6f007c91a4c2d2aa9984c3b7cb298854ff6bb78650722837614c4284c8e1232a484786196afbc0bac256d1c3390c99755e411d46f69b6646208ba3583e4f224
-DIST Csound5.19_manual_html.zip 9860517 SHA256 ba198155bee31cfe27e54ba313453bf100af8f22cc57b7dbcd4edbfe8fb99af5 SHA512 e01ca0e6bac13d7a466d6d93634a870b8dd29ad9b827c8c3ef3fe59ebc942eb32aed2d8cf75a8560debf85c01f7cd94c08e7285c0def8e8aa50f0fb11a443792 WHIRLPOOL d6816455f96b1d3a455647a61756a6d2bcf1575f6c0179f1730ad73fe147e1f5975f469f47464d3f4ba1aa5ff8c70d4b1015807a55f35e4b3458b8cd27c07a3f
-DIST Csound5.19_manual_pdf.zip 5955401 SHA256 2000d817b6d608e8dc537f66412c676240fef604c8c5b3fdbf39bfcb1f7621a6 SHA512 936d4d08ea4610f84d304e9c6dde4eb1aadcd78d3c7a3a1eb64c6a36f6e51ca883fcc6a6ef40a2da13783b6fad81afc85810d242496b367602d49d4fb8ff129c WHIRLPOOL 46da9ac899332bffa399440120c21a0aecbbc72bd13e4dece45589bdc58146bd4053c77f964d203f90d93a3907c7352c52fa34571762b530ee5ed1471a8e9915
 DIST Csound6.01_manual-fr_html.zip 10190112 SHA256 e10f15bc3035654e08a7e756ae95db5c6841d82e97fae5807379937e07a4d98f SHA512 2203cfdd802e2250cda850b2cc22e4442c14c2555a75aae95c05e9dc31eb327bc613a3ca9c9227152eaa629054488668a5fc195b7239f8282b3942c709af447e WHIRLPOOL 85322b06fc37cdc76781badeb9b9907302c6072c635562454b2a6e3a17e5562f5ac6a00a83f5c5485261aa51a1fdadd6e4761e9aac77e8bef70c96a094f5d0a2
 DIST Csound6.01_manual-fr_pdf.zip 6344735 SHA256 ac71275c933002c99ca5a241203749d06d3efb662cfc6e281b4a8b6bfa8a4f55 SHA512 624d7bf48815e94326f05b2cb832e36389f8684c36fe7ea645c38ad2d1f95afa9cf82deb0a9067abce32e56072ecc631e0826218375fb9c3c1a3145a522ba752 WHIRLPOOL 06753a9154b93cb2932225967add3442212d0df2dbe4ce527f9987a04c1ccf78a9ee3fccea00bc96371370003821c5eefeabe851e394b0fe8e3ae327eca0dae5
 DIST Csound6.01_manual_html.zip 9922699 SHA256 7b9e0d99eebfe92d5e1d76c4c852c7403c3d71bf88920ae0c3696233e970257a SHA512 8eeb3acff75155c6c762f574caf6c6b8d616b2e65e895d81235f443e3aa426e036c51880ca66781226e064b1d837296d92e50e6da4e78e0afce63114b5b4f206 WHIRLPOOL d89ee5c7880a5196e0d873fd990298da2d7f0b59d19cdd61c8c829b17408f8c8d933cb21875edb65c3900e995c8b52bab01a84a7f7c9d951fa2d563a35fce739
diff --git a/app-doc/csound-manual/csound-manual-5.17.ebuild b/app-doc/csound-manual/csound-manual-5.17.ebuild
deleted file mode 100644
index bf491411a89b..000000000000
--- a/app-doc/csound-manual/csound-manual-5.17.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-MY_P="Csound${PV}"
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
-	mirror://sourceforge/csound/${MY_P}_manual_pdf.zip
-	linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_pdf.zip )
-
-	html? (
-		mirror://sourceforge/csound/${MY_P}_manual_html.zip
-		linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_html.zip )
-	)"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / linguas_}"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}_manual_pdf.zip
-
-	if use html ; then
-		unpack ${MY_P}_manual_html.zip
-		mv html html-en
-	fi
-
-	local lang
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || continue
-		unpack ${MY_P}_manual-${lang}_pdf.zip
-		if use html ; then
-			unpack ${MY_P}_manual-${lang}_html.zip
-			mv html html-${lang}
-		fi
-	done
-}
-
-src_install() {
-	dodoc *.pdf
-
-	if use html ; then
-		dohtml -r html-en/*
-
-		local lang
-		for lang in ${LANGS} ; do
-			use linguas_${lang} || continue
-			docinto html-${lang}
-			dohtml -r html-${lang}/*
-		done
-	fi
-}
diff --git a/app-doc/csound-manual/csound-manual-5.18.ebuild b/app-doc/csound-manual/csound-manual-5.18.ebuild
deleted file mode 100644
index bf491411a89b..000000000000
--- a/app-doc/csound-manual/csound-manual-5.18.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-MY_P="Csound${PV}"
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
-	mirror://sourceforge/csound/${MY_P}_manual_pdf.zip
-	linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_pdf.zip )
-
-	html? (
-		mirror://sourceforge/csound/${MY_P}_manual_html.zip
-		linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_html.zip )
-	)"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / linguas_}"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}_manual_pdf.zip
-
-	if use html ; then
-		unpack ${MY_P}_manual_html.zip
-		mv html html-en
-	fi
-
-	local lang
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || continue
-		unpack ${MY_P}_manual-${lang}_pdf.zip
-		if use html ; then
-			unpack ${MY_P}_manual-${lang}_html.zip
-			mv html html-${lang}
-		fi
-	done
-}
-
-src_install() {
-	dodoc *.pdf
-
-	if use html ; then
-		dohtml -r html-en/*
-
-		local lang
-		for lang in ${LANGS} ; do
-			use linguas_${lang} || continue
-			docinto html-${lang}
-			dohtml -r html-${lang}/*
-		done
-	fi
-}
diff --git a/app-doc/csound-manual/csound-manual-5.19.ebuild b/app-doc/csound-manual/csound-manual-5.19.ebuild
deleted file mode 100644
index d23addde33c8..000000000000
--- a/app-doc/csound-manual/csound-manual-5.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-MY_P=Csound${PV}
-
-DESCRIPTION="The Csound reference manual"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="
-	mirror://sourceforge/csound/${MY_P}_manual_pdf.zip
-	linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_pdf.zip )
-
-	html? (
-		mirror://sourceforge/csound/${MY_P}_manual_html.zip
-		linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_html.zip )
-	)"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html"
-
-LANGS=" fr"
-IUSE+="${LANGS// / linguas_}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${MY_P}_manual_pdf.zip
-
-	if use html ; then
-		unpack ${MY_P}_manual_html.zip
-		mv html html-en
-	fi
-
-	local lang
-	for lang in ${LANGS} ; do
-		use linguas_${lang} || continue
-		unpack ${MY_P}_manual-${lang}_pdf.zip
-		if use html ; then
-			unpack ${MY_P}_manual-${lang}_html.zip
-			mv html html-${lang}
-		fi
-	done
-}
-
-src_install() {
-	dodoc *.pdf
-
-	if use html ; then
-		dohtml -r html-en/*
-
-		local lang
-		for lang in ${LANGS} ; do
-			use linguas_${lang} || continue
-			docinto html-${lang}
-			dohtml -r html-${lang}/*
-		done
-	fi
-}
diff --git a/app-editors/kile/kile-2.1.3-r1.ebuild b/app-editors/kile/kile-2.1.3-r2.ebuild
similarity index 94%
rename from app-editors/kile/kile-2.1.3-r1.ebuild
rename to app-editors/kile/kile-2.1.3-r2.ebuild
index e6f2e9ee83bb..88bf9771a7bf 100644
--- a/app-editors/kile/kile-2.1.3-r1.ebuild
+++ b/app-editors/kile/kile-2.1.3-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdebase-data)
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	|| (
 		$(add_kdeapps_dep okular 'pdf?,postscript')
 		app-text/acroread
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 46d8b48f59f0..df9efb1e4af5 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -9,4 +9,5 @@ DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb226
 DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6
 DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f
 DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
+DIST xen-security-patches-4.tar.gz 7731 SHA256 b51c6616a303b4d5123fed1e58240163c8e0cf8e0de32db58c11a40a48124d52 SHA512 cef89bb68bdb4a5f947d6be8ae7a799276fd187e396c5ba85f8aa2b0b5349ba606d3742d5b8d8212df6da38f8af9711416d9a25176e713240a0a7f2194d84fc5 WHIRLPOOL 912dc869fa4eb355a86023133adcb818e87f4979d537a885b3f1c6e35ff141b7d7a33e81105dcddf34aafa4c306df79a210346f5037337173923e1dc8280ac47
 DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
diff --git a/app-emulation/xen/xen-4.6.0-r5.ebuild b/app-emulation/xen/xen-4.6.0-r5.ebuild
new file mode 100644
index 000000000000..f3e0d7609b02
--- /dev/null
+++ b/app-emulation/xen/xen-4.6.0-r5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=0
+	# var set to reflect https://dev.gentoo.org/~idella4/
+	SEC_VER=4
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
+			epatch $i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-forensics/afl/Manifest b/app-forensics/afl/Manifest
index 067d900a09ad..3d8970bd6080 100644
--- a/app-forensics/afl/Manifest
+++ b/app-forensics/afl/Manifest
@@ -1,3 +1,2 @@
-DIST afl-1.45b.tgz 775889 SHA256 c183b94c5734bb3558d7129833f0345df250fe9a1f4f8b1ce15ac2dc7e89b50f SHA512 82a5d56010baa69ab679cc49fa8193eff2eb0fcbacbedef8cc8216952750c66381f671d6a321a3665473ddf65a7da73d3723ff497803b18fec2bd0d19dfd4f51 WHIRLPOOL 9dd1727cf81466e1451d66b317b7cfb88033038d1943e0da63ee2684f0f17f9f5c73015727414c6779d07499954ece71c59812182abb75416873404ac52643a8
-DIST afl-1.57b.tgz 782637 SHA256 e4166a57e9ef812834c498a1d95f6fcab9b1805e7ba531bc00278cffa680bc15 SHA512 87d29ee22c7d097c672c106cc2eeac2fa26de646f2539e46444640c836887f8a4c7188e7bc30ab43d1a94b340bd55aaeea25171531d09331393395b0156e9cda WHIRLPOOL f7bbfeed279866ab27f5f5064d4a559682fd3ac04a017ae2d75cb1bd7bf9377b0d7e20b57f1217a89586b1e8a4d5bf062e7020a41eac7cb4c8d47d5e5d71d60d
 DIST afl-1.80b.tgz 797509 SHA256 e042cfe30d03ef6df3ae92619408e236d1a8e9bb6cf94ca107c4519e23161401 SHA512 822e93643f0ca10e9ce3eb726667e70eae1789029385cb5332eef65589f7ef0350e6775108634b642e5b394c46599b1e7943227c93cb1b1b50facf1f9e069095 WHIRLPOOL 9e761ee67321cf8980229f6a0245b3c31c9d195db21ec240adef14113020e360d856a4e8de3ab9abce08205a1f085ad8c1f7826ae20702f54de402c21c2b9b72
+DIST afl-1.96b.tgz 804864 SHA256 03beb06f8993dcb37d348e53da19ca9d064c83fcedc9d87b0b506c73c310f27c SHA512 a55d89ffe9c89586b70f8a9ab80330cc0511f453d5918045ec06289093ca5321611b08a522bb058e3c16ddc9b5d5ec221ce1cab9819b79f4738cba15f2aadff0 WHIRLPOOL 997efe32fcb0d2c53e9ed9b2bb31dd776ccdafb93990505676bbf04f2a4791ffa814ab8da0a6e4febdfd6184e41497a4509fa9ac3964b5ef6ed7a1c607982bb5
diff --git a/app-forensics/afl/afl-1.45b.ebuild b/app-forensics/afl/afl-1.45b.ebuild
deleted file mode 100644
index 2ceb6deb5641..000000000000
--- a/app-forensics/afl/afl-1.45b.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
-HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases//${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}" \
-		install
-}
diff --git a/app-forensics/afl/afl-1.80b.ebuild b/app-forensics/afl/afl-1.80b.ebuild
index a6acdfd8c856..c726297a1af3 100644
--- a/app-forensics/afl/afl-1.80b.ebuild
+++ b/app-forensics/afl/afl-1.80b.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$
 
@@ -8,7 +8,7 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
 HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases//${P}.tgz"
+SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-forensics/afl/afl-1.57b.ebuild b/app-forensics/afl/afl-1.96b.ebuild
similarity index 69%
rename from app-forensics/afl/afl-1.57b.ebuild
rename to app-forensics/afl/afl-1.96b.ebuild
index 2ceb6deb5641..c726297a1af3 100644
--- a/app-forensics/afl/afl-1.57b.ebuild
+++ b/app-forensics/afl/afl-1.96b.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$
 
@@ -8,14 +8,14 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
 HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases//${P}.tgz"
+SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-
-DEPEND="sys-devel/gcc"
+DEPEND="sys-devel/gcc:*
+	sys-devel/clang"
 RDEPEND="${DEPEND}"
 
 src_compile() {
@@ -23,6 +23,11 @@ src_compile() {
 		PREFIX="/usr" \
 		HELPER_PATH="/usr/$(get_libdir)/afl" \
 		DOC_PATH="/usr/share/doc/${PF}"
+	cd llvm_mode
+	emake \
+		PREFIX="/usr" \
+		HELPER_PATH="/usr/$(get_libdir)/afl" \
+		DOC_PATH="/usr/share/doc/${PF}"
 }
 
 src_install() {
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index e154d0f2db1b..c266294a5ae6 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1 +1,2 @@
 DIST abook-0.6.0pre2.tar.gz 411412 SHA256 59d444504109dd96816e003b3023175981ae179af479349c34fa70bc12f6d385 SHA512 d1bc437981964a5dd873b12458833c60306d37b36904a04b072cefe7501175933dd7817ca51f8634bbd6722f79f768b39e00b68d0699086d5efaf28d0cbdf1ed WHIRLPOOL fbaed8cc4dff1b7b7786c4f5b4124e94893d59e97b67372b0b1f1cf176a16ef23141c37255589cfb352f1e4993ae69d1f77077f2396aaa2c482e85b3c617fc5f
+DIST abook-0.6.1.tar.gz 319558 SHA256 f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9 SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66 WHIRLPOOL 5257a6000707ea58f21fa95841edcfcdb8a1f4921fa452b8aefdbd9bd2eecba01078d116d0e79316bde5b484a721640ffc501c0402a6601803c9312e1e4a2e6a
diff --git a/app-misc/abook/abook-0.6.0_pre2.ebuild b/app-misc/abook/abook-0.6.0_pre2.ebuild
index e383d809c9ba..e3d70b02b5a6 100644
--- a/app-misc/abook/abook-0.6.0_pre2.ebuild
+++ b/app-misc/abook/abook-0.6.0_pre2.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$
 
@@ -32,6 +32,11 @@ src_configure() {
 	econf $(use_enable nls)
 }
 
+src_compile() {
+	# bug 570428
+	emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc BUGS ChangeLog FAQ README TODO sample.abookrc || die "dodoc failed"
diff --git a/app-misc/abook/abook-0.6.1.ebuild b/app-misc/abook/abook-0.6.1.ebuild
new file mode 100644
index 000000000000..ee129acf9418
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	dev-libs/libvformat
+	nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# TODO: do the right thing and find out whats wrong with Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-curses \
+		--with-readline \
+		--enable-vformat \
+		$(use_enable nls)
+}
+
+src_compile() {
+	# bug 570428
+	emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS ChangeLog FAQ README TODO sample.abookrc
+}
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 686dbc9cdf30..c53a99fe9e47 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
 DIST carbon-c-relay-0.44.tar.gz 54533 SHA256 424f5eebdfcd8cd42f07495b97c440e9133723966013d63fe3f6d8220bd031dc SHA512 ae0ded77d189c22bab0400922831211f411d47b92bde44f9a4c4208a094a57ac875a52e04ef6297238281bb44c8869f0510b3a3b6dc1c564e02e4f22bb69e268 WHIRLPOOL b7351576d7f1bdb5c0929967faacd6861a10f8d8d3bedebcc9bf7a3f15e0b9ea2d3475ecd8e700e3f2fb190698ea343fcb4530d10522591512f1de9d787a0ab2
 DIST carbon-c-relay-0.45.tar.gz 63208 SHA256 ba76d93d0448eae64147d580c2767ed42a8a9dd4a6c0f3e15a41276793bc53df SHA512 7a5068a6a1502c80b03c642abb72639de644351edc2967736c6f40939a6e28598727ad7bec9008eb76c3211552d6583f0ec9670e7c32952c0f49f6b4cb9a6085 WHIRLPOOL 089a9a6c3fb40e1bfc680b7002bf9967c4a182ae00616933cd5b3ba9febda20853e716df69d552ade131aa272cd16dafb65d1ba84afeacb4383d87f9e028bf97
-DIST carbon-c-relay-1.3.tar.gz 69269 SHA256 80003400f0959562e9ada4fb6311c67dcc9bc4c4b5ba75dc10a8b3089826837b SHA512 7734d71944def438b66566ed6cfb94ad1d8d25de016af9c90e145161ce831a7e23f804545f2b711e3faefa8eab24f53d2e76f0fd29a8ea3765f4ce8c55218ebc WHIRLPOOL b9f1c30db5356778e3dc5ee3fbf1c002898708c69e613732bfbe58f1087fdd03f31d601a3094d8e23ee7bf2df21d1f17537649a02832249cfa4e7a4c7d5394be
+DIST carbon-c-relay-1.4.tar.gz 71367 SHA256 8575be832d204a0c12e4cd793ae05d5c2683974a90e93aeb70e69199b7991d45 SHA512 389d08bccdbd2e566a2580017fb14afd37b0c609f20ecdef526f4810d50c84e06f396a161f0ad4eb7d1810cada9f24640b19afe7a18dd241a16d435cc72d8d0d WHIRLPOOL ad639e96e7589e7cd84e71d4840afeab9f18e768ee98fa9ab6e3d69e4255ad74e5b715e71667eaf330e9a7cc20ce2158058683081bb91785863cbcd5e6a4dccf
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
similarity index 94%
rename from app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
index e20b1c5dec80..263b0462af5b 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-1.4.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$
 
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
new file mode 100644
index 000000000000..9456297b2483
--- /dev/null
+++ b/app-misc/chkcrontab/Manifest
@@ -0,0 +1 @@
+DIST chkcrontab-1.6.tar.gz 24701 SHA256 be7436d5ece4ad6390365f6edf0f1dc59dfd655a9de3b4699884343ceb150f2e SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b WHIRLPOOL 13995293e761930d0d900c3e7fa5b7695fad3416ade96fc34be415a448ca5e5969f5b82889d46041ed801ca2f13e5154a01698d753898ee9027bd9a2c8e6e29f
diff --git a/app-misc/chkcrontab/chkcrontab-1.6.ebuild b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
new file mode 100644
index 000000000000..7e27c3fa3dc9
--- /dev/null
+++ b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
new file mode 100644
index 000000000000..d8aa7d5ac921
--- /dev/null
+++ b/app-misc/chkcrontab/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomas Mozes</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lyda/chkcrontab</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/taskd/Manifest b/app-misc/taskd/Manifest
new file mode 100644
index 000000000000..3901f52352ee
--- /dev/null
+++ b/app-misc/taskd/Manifest
@@ -0,0 +1 @@
+DIST taskd-1.1.0.tar.gz 120115 SHA256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 SHA512 df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa WHIRLPOOL f3247de0ab1ecfed48e6c4e2f2391d370e77b6fb17a4aee5b0824efb1c0e70b725a6d9a544ffb9611d2dcba9956ec0443b0161ca8310f56a41cdd89b99335591
diff --git a/app-misc/taskd/files/config b/app-misc/taskd/files/config
new file mode 100644
index 000000000000..51a8cddf7992
--- /dev/null
+++ b/app-misc/taskd/files/config
@@ -0,0 +1,17 @@
+confirmation=1
+extensions=/usr/libexec/taskd
+ip.log=on
+log=/var/log/taskd/taskd.log
+pid.file=/run/taskd.pid
+queue.size=10
+request.limit=1048576
+root=/var/lib/taskd
+server=localhost:53589
+trust=strict
+verbose=1
+# TLS config:
+#ciphers=
+#ca.cert=/etc/taskd/tls/ca.pem
+#server.cert=/etc/taskd/tls/server.crt.pem
+#server.crl=/etc/taskd/tls/server.crl.pem
+#server.key=/etc/taskd/tls/server.key.pem
diff --git a/app-misc/taskd/files/taskd.confd b/app-misc/taskd/files/taskd.confd
new file mode 100644
index 000000000000..aadbc6e8f741
--- /dev/null
+++ b/app-misc/taskd/files/taskd.confd
@@ -0,0 +1 @@
+TASKDDATA="/var/lib/taskd"
diff --git a/app-misc/taskd/files/taskd.initd b/app-misc/taskd/files/taskd.initd
new file mode 100644
index 000000000000..bbee5216694e
--- /dev/null
+++ b/app-misc/taskd/files/taskd.initd
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+need="net localmount"
+command="/usr/bin/taskd"
+command_args="server --data ${TASKDDATA:-/var/lib/taskd}"
+pidfile="/run/taskd.pid"
+start_stop_daemon_args="--user taskd:taskd"
+command_background=1
+extra_started_commands="reload"
+
+reload() {
+	kill -HUP "$(cat $pidfile)"
+}
diff --git a/app-misc/taskd/files/taskd.logrotate b/app-misc/taskd/files/taskd.logrotate
new file mode 100644
index 000000000000..cfce919c114d
--- /dev/null
+++ b/app-misc/taskd/files/taskd.logrotate
@@ -0,0 +1,8 @@
+/var/log/taskd/taskd.log {
+    daily
+    missingok
+    rotate 7
+    compress
+    delaycompress
+    copytruncate
+}
diff --git a/app-misc/taskd/metadata.xml b/app-misc/taskd/metadata.xml
new file mode 100644
index 000000000000..b8c3e058cb60
--- /dev/null
+++ b/app-misc/taskd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>mschiff@gentoo.org</email>
+	<name>Marc Schiffbauer</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..643b1551d4a7
--- /dev/null
+++ b/app-misc/taskd/taskd-1.1.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils systemd user
+
+DESCRIPTION="the server part of Taskwarrior, a command-line todo list manager"
+HOMEPAGE="http://taskwarrior.org/"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/readline:0
+	net-libs/gnutls
+	sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DTASKD_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	systemd_dounit "${S}"/scripts/systemd/taskd.service
+
+	insinto /usr/share/${PN}/pki
+	doins pki/*
+
+	insinto /usr/share/${PN}/mon
+	doins mon/*
+
+	newinitd "${FILESDIR}"/taskd.initd taskd
+	newconfd "${FILESDIR}"/taskd.confd taskd
+
+	grep ^TASKDDATA= "${FILESDIR}"/taskd.confd > 90taskd
+	doenvd 90taskd
+
+	dodir /etc/taskd
+	keepdir /usr/libexec/taskd
+
+	diropts -m 0750
+	dodir /var/lib/taskd
+	keepdir /var/log/taskd
+
+	diropts -m 0700
+	keepdir /var/lib/taskd/orgs /etc/taskd/tls
+
+	insopts -m0600
+	insinto /etc/taskd
+	doins "${FILESDIR}"/config
+
+	dosym /etc/taskd/config /var/lib/taskd/config
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/taskd.logrotate taskd
+}
+
+pkg_preinst() {
+	enewgroup taskd
+	enewuser taskd -1 -1 /var/lib/taskd taskd
+}
+
+pkg_postinst() {
+	chown taskd:taskd /var/lib/taskd{,/orgs} /var/log/taskd /etc/taskd/{config,tls}
+
+	einfo ""
+	einfo "For configuration see 'man taskdrc' and edit /etc/taskd/config"
+	einfo "You will need to configure certificates first in order to use taskd"
+	einfo ""
+	ewarn ""
+	ewarn "Do not use 'taskd init' as this will replace the config file and set"
+	ewarn "default but unsuitable paths"
+	ewarn ""
+	ewarn "In order to manage taskd via 'taskd' either relogin or run 'source /etc/profile'"
+	ewarn ""
+}
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 351cd50348ab..612adede7a30 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -7,3 +7,4 @@ DIST eix-0.31.1.tar.bz2 791116 SHA256 1402d474ee3d1dc6fcfe35508657629d4a5aef6cbe
 DIST eix-0.31.2.tar.bz2 787190 SHA256 c03226d0971067561e931c0afe75878552a6178ede7326601c3a839b289c72d9 SHA512 61a7f58ba48030000bd4ca50575aec95ba7726c12d935bd1fa7a2b28440fbc66a272fc727bc6a2b7716e285d3b93b7a888cef017c66d8682f29e9388dc89a6a1 WHIRLPOOL d67ab5ee83ab74c895f5e7345b40a7313c1ad1a1a2af184f54e5481eed9f6134920c172fe1dcae0522b2d965832e76cfbe14020181d799eff04a1afc6938af64
 DIST eix-0.31.3.tar.bz2 795783 SHA256 bc578fa28be43ec321054df6e4727f2dd4c09b1ca8e1e9b1d4ebe064bdd7f03c SHA512 f0f07fbcb0b8696d7e689fd322ba3475d4d10c2ba703981de7458cf5f37c7d06746fac753cc14a7fd0c434c9e284127a64f941bbad408ebc077807b8f33952bb WHIRLPOOL a00556d5a57ee665e327071580e63107c27df60b96690c8c249b15487867bbc720244d1926c3f54795f7d6bdb6348f09d7cbfbd29f52a43b4dc8e0994579f58b
 DIST eix-0.31.4.tar.xz 579480 SHA256 87051338b523f07a734c3c07e30fe99b4ca85ed268df60a54aeed1b594e1b7d0 SHA512 1a43fd8a4686f6e6c3021fb67acaa9ac0b19baad539e10d0ebd3db38bfc6179ce4b1c91745f76f167c32e45f9164ed3f1a8129a9eb97d8bc3bd35027999c5dc2 WHIRLPOOL 0f3962b7b72b9c12d9e2b0561ab242ebfcc48161e259667ed0752d49d2419c7a6f801481b48522605d8aa20968c688f917b24a823009a8f5a9e780a845afaa09
+DIST eix-0.31.5.tar.xz 580740 SHA256 32ec5d6fdc7bf10db5fea076836b30ed034a0510962ea0cbe4f09a5919502b9c SHA512 868886a2ac6bdcfe96661030701e03eeca7d7c8a3c3a900845c90cd852e02947e481ff2ce9abe21bb62272b58e4f9415c9fdc91420897ed827b3b0220e7c7eca WHIRLPOOL 546be9401649e8a04f5f4b988f783d6b084d6a83f257bb67f78b2cc512068cff5ec200fb6f5f18746e64b1f6a56a55635b3a56fb82450b8a780a5d1ff2eb92b4
diff --git a/app-portage/eix/eix-0.30.10.ebuild b/app-portage/eix/eix-0.30.10.ebuild
index 32c62b26f2e4..936a68a8b2b0 100644
--- a/app-portage/eix/eix-0.30.10.ebuild
+++ b/app-portage/eix/eix-0.30.10.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
 
diff --git a/app-portage/eix/eix-0.30.11.ebuild b/app-portage/eix/eix-0.30.11.ebuild
index 7254e3d785fe..6bc675cf1a25 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
 
diff --git a/app-portage/eix/eix-0.30.4.ebuild b/app-portage/eix/eix-0.30.4.ebuild
index 7c936abe3be7..fb0235c07665 100644
--- a/app-portage/eix/eix-0.30.4.ebuild
+++ b/app-portage/eix/eix-0.30.4.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
 
diff --git a/app-portage/eix/eix-0.30.7.ebuild b/app-portage/eix/eix-0.30.7.ebuild
index 7a31b9d96b32..d75223e7076e 100644
--- a/app-portage/eix/eix-0.30.7.ebuild
+++ b/app-portage/eix/eix-0.30.7.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
 
diff --git a/app-portage/eix/eix-0.30.8.ebuild b/app-portage/eix/eix-0.30.8.ebuild
index 7a31b9d96b32..d75223e7076e 100644
--- a/app-portage/eix/eix-0.30.8.ebuild
+++ b/app-portage/eix/eix-0.30.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
 
diff --git a/app-portage/eix/eix-0.31.1.ebuild b/app-portage/eix/eix-0.31.1.ebuild
index c3d65169f673..aff982a78a3d 100644
--- a/app-portage/eix/eix-0.31.1.ebuild
+++ b/app-portage/eix/eix-0.31.1.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$
 
@@ -7,7 +7,7 @@ EAPI=5
 PLOCALES="de ru"
 inherit bash-completion-r1 eutils l10n
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
 
diff --git a/app-portage/eix/eix-0.31.2.ebuild b/app-portage/eix/eix-0.31.2.ebuild
index 6579e25c97c5..aff982a78a3d 100644
--- a/app-portage/eix/eix-0.31.2.ebuild
+++ b/app-portage/eix/eix-0.31.2.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$
 
diff --git a/app-portage/eix/eix-0.31.3.ebuild b/app-portage/eix/eix-0.31.3.ebuild
index 6579e25c97c5..aff982a78a3d 100644
--- a/app-portage/eix/eix-0.31.3.ebuild
+++ b/app-portage/eix/eix-0.31.3.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$
 
diff --git a/app-portage/eix/eix-0.31.4.ebuild b/app-portage/eix/eix-0.31.4.ebuild
index 8715cf5588b3..38dc150bda12 100644
--- a/app-portage/eix/eix-0.31.4.ebuild
+++ b/app-portage/eix/eix-0.31.4.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$
 
diff --git a/app-portage/eix/eix-0.31.5.ebuild b/app-portage/eix/eix-0.31.5.ebuild
new file mode 100644
index 000000000000..878b44951be2
--- /dev/null
+++ b/app-portage/eix/eix-0.31.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit bash-completion-r1 l10n systemd
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+	app-shells/push"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-security) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_enable swap-remote) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		--with-zsh-completion \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+	test -d "${EROOT}var/cache/${PN}" || {
+		mkdir "${EROOT}var/cache/${PN}"
+		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	}
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index c9f8bfde9703..0e220a7b6667 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -277,4 +277,4 @@ DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68
 DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08
 DIST bash43-040 1532 SHA256 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0 WHIRLPOOL a435f25ae432161f676b4965cc20cc096fa18af8a191dca7cb311a41e3504e5d27c668fb3430fece1de45e0eed9cb34357dc887e83ace9819f24d585eddf6720
 DIST bash43-041 2362 SHA256 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819 WHIRLPOOL c88e754d694b69bcb3ce390ab3e29932b30a74f8f15b75b570cc46699c072b0f872824766c45bc2a98627529896bdf5aaf6493a493ffd33932d9ed6a362defb3
-DIST bash43-042 1535 SHA256 b75a53141ab3d8fff3fa74b5f3dc76468b01eae299f50bbc2bc71ae395d690af SHA512 f1530203d4ec42fa65db7ed4ee07f82b3be78dc3fa6532a222447acaaa8ff36a48979b153767b9191e5f9c2709d9822d71f816b9fc9f40e549e18831df5f9c3e WHIRLPOOL 15c84a013a7b0ed021a2ccbe5895d34a3187cd3139c382fa69bef1401961040860125448da45f82ace300c201a22ccbe7160c73dcfecd6ee0f837a10d307eebe
+DIST bash43-042 1535 SHA256 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a WHIRLPOOL 790b15282a81f5717fb675ea4ae752382ddb1b101766e32c68deb1ec1d64fcf8841b3da556b87ac685e18b528a1de31bc4b94900369f6386f8e3991ed76232c1
diff --git a/app-shells/bash/bash-4.3_p42.ebuild b/app-shells/bash/bash-4.3_p42-r1.ebuild
similarity index 100%
rename from app-shells/bash/bash-4.3_p42.ebuild
rename to app-shells/bash/bash-4.3_p42-r1.ebuild
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 9f977a2aef96..7a21ba30199a 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,2 +1,3 @@
 DIST push-1.5.tar.gz 1971 SHA256 7c9068a619bcc49e3e13f819e23e1c05464729df0529753557f23f65e922fdad SHA512 77f4afd1a8226b0b4104008fcea2a61e5c9a7930b08266e069c387c806ef86e8d5641d70ece6dfd02557c956fc916134551d10777e5730973657d767370f8a26 WHIRLPOOL e1d71d7d9369bf23fe9046a34f7c9cd4f7ff79b4db3e13a9cef089113e31f7db2ecb6ff13e899e1db7726359b68260776723f73201d3db0472d267b8db7515b2
 DIST push-1.6.tar.gz 1955 SHA256 713dea172ede55971ff82da932782503c2aa6703eba73c1ac317ec4c8eb22e80 SHA512 4623f51249138bacb7251fb5d5d1ae8dd070de7ce628e42b6eed90a4b6ffd36d28eb58b116f5b1833bc1affa8db539da9b94d104ffe03c6bd1e294b56c393c86 WHIRLPOOL 787f65542e92fd10c411969d03ec17b45a90b35e9c8e17b9fb3e732fb1d97813f04c3a03cc329a469a5bea2a194f879f4c600e2e534dd8c778f7f712d4c171b1
+DIST push-1.8.tar.gz 1942 SHA256 99ae56c932b59b8b74c6a6d0972dfe5b65458d6871581168918264c5aa50bdbd SHA512 518568fc72d161d3abaea0a0c529d94fc9ad6dc46d18d300990de1367617e095befb8436e69267ebc11bd4dcbbbd9bca6375fc184666e442af6e2eaa68a992e5 WHIRLPOOL 5a763560b8afd4593aa1d0afc8f3ed5b053041c63d5aa742e485c25046191e8c733cdaf265117e23726c2c7cc8aeb87d3858a6228932192c2ee87ff4682e626d
diff --git a/app-shells/push/push-1.8.ebuild b/app-shells/push/push-1.8.ebuild
new file mode 100644
index 000000000000..2de3b236ffc9
--- /dev/null
+++ b/app-shells/push/push-1.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
+HOMEPAGE="https://github.com/vaeth/push/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE=""
+
+src_install() {
+	insinto /usr/bin
+	doins push.sh
+	dodoc README
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 177535e086ab..1126e4266fea 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,2 +1,3 @@
 DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
 DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8
+DIST xiphos-4.0.4-20150830.tar.gz 8040173 SHA256 413bb8acb444946ccde1fb9fcfa3ff4bdb622cb56995b557f3215fab42193f20 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda WHIRLPOOL a1795b6fe5c978fcfc2c1f17f48844797bcf6e07a272181168717807dfd0a7b6e9359380a21fa330c539f1197c54c7e7293457f7733ab55d9dcca274ba044991
diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
new file mode 100644
index 000000000000..b5fbabdecc4d
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	net-libs/biblesync
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index ebaaf21c0c8e..52cf81d79709 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,4 @@
 DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
-DIST mongodb-src-r2.4.13.tar.gz 14183056 SHA256 9ad8a3b58457c35b6dd020ca2364ee605e30b839f5475449a229fdcd4115866c SHA512 26256410593f2072e8a8728fbb2665bb98d4c73f3601136e8306d1d6b421421827f66e4073515fea7dfbc0a27f5615cd30f8a85e5980ea3dd46f2f06366946cb WHIRLPOOL 6e64a8ba466da74342f7eabd41b8eb86a3d1cd99c5665e54872642230ec0ed86216c0e533b08d21e0c6b6c20b7d7887a34aad0679ba32523dd3ca0e464190348
-DIST mongodb-src-r2.4.14.tar.gz 15120808 SHA256 f5ed949cf7c9669267e6f426f3dc30bf6c0e2d68ba7df9e29f16799e8212e7ce SHA512 6811f27a57a2df07f59215f544948708cd5846237c24df6eb14bf09384db4136d964587d82008ff2b0a4dea94d6869fc1dcf2ccd07e5f285da5012a0a091a74f WHIRLPOOL c89b2f4f1a77523f895b3fa21ec82813a4859391c82e3934952b25ab8602c30ac13b9e6b2a00082bbe7bace32edacdb3270e46ac0f3a8c0ab10ea48b5911e019
 DIST mongodb-src-r2.6.11.tar.gz 16461163 SHA256 e1a64a1ef7114f3e8ed3c7acaa4e97ffe30e2b57a1a5f2a40f0018bad3b8d12f SHA512 43b8c5e1ffde2c7f4bead392a95fdb34169419b8296acf04a17894379647c09bbec91be88037ab447da399f03a2c7c54c9d7613df0baa6e9e48e1267327ca937 WHIRLPOOL 083c897f83992c64a89e595058b7695671ca7e9339be2a54d14cf8a200d5063f4a33c320c02e45f5d3bd6367b5acf67a80677c92abba9a92a647d7310a2e6316
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
deleted file mode 100644
index b6c9a1eb55df..000000000000
--- a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mongodb-src-r2.2.0/SConstruct.old	2012-10-09 12:41:25.000000000 -0400
-+++ mongodb-src-r2.2.0/SConstruct	2012-10-09 12:41:41.000000000 -0400
-@@ -171,8 +171,8 @@
- add_option( "extrapathdyn", "comma separated list of add'l paths  (--extrapath /opt/foo/,/foo) dynamic linking" , 1 , True )
- add_option( "extralib", "comma separated list of libraries  (--extralib js_static,readline" , 1 , True )
- 
--add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
--add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
-+add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , False , "boostCompiler" )
-+add_option( "boost-version", "boost version for linking(1_38)" , 1 , False , "boostVersion" )
- 
- add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
- 
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch b/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
deleted file mode 100644
index 553967e8dedd..000000000000
--- a/dev-db/mongodb/files/mongodb-2.4-fix-sasl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/mongo/client/sasl_client_session.cpp	2014-10-15 00:40:29.000000000 +0400
-+++ b/src/mongo/client/sasl_client_session.cpp	2015-02-07 18:56:02.287762467 +0300
-@@ -29,17 +29,26 @@
-      * doesn't initialize the library for us.
-      */
- 
--    void* saslOurMalloc(unsigned long sz) {
-+// Version 2.1.26 is the first version to use size_t in the allocator signatures
-+#if (SASL_VERSION_FULL >= ((2 << 16) | (1 << 8) | 26))
-+    typedef size_t SaslAllocSize;
-+#else
-+    typedef unsigned long SaslAllocSize;
-+#endif
-+
-+    typedef int(*SaslCallbackFn)();
-+
-+    void* saslOurMalloc(SaslAllocSize sz) {
-         return ourmalloc(sz);
-     }
- 
--    void* saslOurCalloc(unsigned long count, unsigned long size) {
-+    void* saslOurCalloc(SaslAllocSize count, SaslAllocSize size) {
-         void* ptr = calloc(count, size);
--        if (!ptr) printStackAndExit(0);
-+        if (!ptr) abort();
-         return ptr;
-     }
- 
--    void* saslOurRealloc(void* ptr, unsigned long sz) {
-+    void* saslOurRealloc(void* ptr, SaslAllocSize sz) {
-         return ourrealloc(ptr, sz);
-     }
- 
diff --git a/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
deleted file mode 100644
index 5050fe7daa35..000000000000
--- a/dev-db/mongodb/files/mongodb-2.4.11-fix-scons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- b/SConstruct	2014-09-01 19:12:24.289585592 +0200
-+++ a/SConstruct	2014-09-01 19:14:12.550312261 +0200
-@@ -704,7 +704,6 @@
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -719,9 +718,10 @@
-             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=["-fPIC", "-pthread",  "-rdynamic"] )
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
- 
-     #make scons colorgcc friendly
-     for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
deleted file mode 100644
index 4f76c5a79f9f..000000000000
--- a/dev-db/mongodb/files/mongodb.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mongodb essentials
-MONGODB_EXEC="/usr/bin/mongod"
-MONGODB_RUN="/var/run/mongodb"
-MONGODB_DATA="/var/lib/mongodb"
-MONGODB_USER="mongodb"
-
-# Listen to specified IP, comment this to listen to all
-MONGODB_IP="127.0.0.1"
-
-# Listen to specified port
-MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-MONGODB_OPTIONS="--journal"
diff --git a/dev-db/mongodb/files/mongodb.initd-r1 b/dev-db/mongodb/files/mongodb.initd-r1
deleted file mode 100644
index f52cca2fd408..000000000000
--- a/dev-db/mongodb/files/mongodb.initd-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	use net
-}
-
-start() {
-	checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
-
-	# Listen to MONGODB_IP if configured
-	[ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
-
-	# Baselayout-1 user should use --chuid instead of --user
-	local USEROPT="--user"
-	if [ ! -f /etc/init.d/sysfs ]; then
-		USEROPT="--chuid"
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		${USEROPT} ${MONGODB_USER:-mongodb} \
-		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
-		-- \
-		--port ${MONGODB_PORT:-27017} \
-		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		${MONGODB_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 384484cf1ab2..d8ed9c9e2fbb 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -21,9 +21,6 @@
 	</longdescription>
 	<use>
 		<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
-		<flag name="sharedclient">build client shared library libmongoclient.so</flag>
-		<flag name="spidermonkey">Use embedded SpiderMonkey engine
-			(<pkg>dev-lang/spidermonkey</pkg>) instead of v8</flag>
 		<flag name="tools">Install the MongoDB tools (mongoimport, mongodump...) 
 			from <pkg>app-admin/mongo-tools</pkg></flag>
 	</use>
diff --git a/dev-db/mongodb/mongodb-2.4.13.ebuild b/dev-db/mongodb/mongodb-2.4.13.ebuild
deleted file mode 100644
index 271b973924ed..000000000000
--- a/dev-db/mongodb/mongodb-2.4.13.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	app-arch/snappy
-	ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use sharedclient; then
-		scons_opts+=" --sharedclient"
-	fi
-
-	if use spidermonkey; then
-		scons_opts+=" --usesm"
-	else
-		scons_opts+=" --usev8"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	if ! use spidermonkey; then
-		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-	fi
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-	if use mms-agent; then
-		elog "You have to configure MMS Agent yourself :"
-		elog "Edit the settings.py file in the /opt/mms-agent/ folder."
-	fi
-}
diff --git a/dev-db/mongodb/mongodb-2.4.14.ebuild b/dev-db/mongodb/mongodb-2.4.14.ebuild
deleted file mode 100644
index feb3aa8211ac..000000000000
--- a/dev-db/mongodb/mongodb-2.4.14.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	app-arch/snappy
-	ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --disable-warnings-as-errors --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use sharedclient; then
-		scons_opts+=" --sharedclient"
-	fi
-
-	if use spidermonkey; then
-		scons_opts+=" --usesm"
-	else
-		scons_opts+=" --usev8"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.11-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-sasl.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	if ! use spidermonkey; then
-		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-	fi
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-	if use mms-agent; then
-		elog "You have to configure MMS Agent yourself :"
-		elog "Edit the settings.py file in the /opt/mms-agent/ folder."
-	fi
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 6635b1b2f81b..521e9b2f297a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index e9913890799b..ca4b0ed642b8 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.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$
 
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-ant-2 eutils
 
-DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java"
+DESCRIPTION="Java Libraries for High Performance Scientific and Technical Computing"
 SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
 HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
 
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 204ab4fbd7d2..df5eb8d8f136 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.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="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
 
 LICENSE="Apache-2.0"
 SLOT="18"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/javax-inject:0
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
new file mode 100644
index 000000000000..1825a681fb89
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc ppc64 x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.8
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
deleted file mode 100644
index 33b98183769e..000000000000
--- a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441543564 -3600
-#      Sun Sep 06 13:46:04 2015 +0100
-# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
-# Parent  e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
-Dynamically set the maximum heap size on Linux
-
-diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp	Mon Feb 11 19:31:28 2013 +0100
-+++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:46:04 2015 +0100
-@@ -33,6 +33,10 @@
- #include <errno.h>
- #include <stdlib.h>
- 
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "vm/types.h"
- 
- #include "arch.h"
-@@ -702,6 +706,19 @@
- 	opt_heapstartsize = HEAP_STARTSIZE;
- 	opt_stacksize     = STACK_SIZE;
- 
-+#if defined(__LINUX__)
-+	// Calculate 1/4 of the physical memory.
-+	uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+	if (qmem > INT32_MAX) {
-+		// More than 2GB will overflow so cap it.
-+		opt_heapmaxsize = 2047 * 1024 * 1024;
-+	} else if (qmem > HEAP_MAXSIZE) {
-+		// Otherwise use this if greater than default (128MB).
-+		opt_heapmaxsize = (s4) qmem;
-+	}
-+#endif
-+
- 	// First of all, parse the -XX options.
- 
- #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/6-cacao-pr-157.patch b/dev-java/icedtea/files/6-cacao-pr-157.patch
new file mode 100644
index 000000000000..3419b8f12be8
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-pr-157.patch
@@ -0,0 +1,143 @@
+diff -Naur cacao/cacao/src/vm/options.c cacao/cacao/src/vm/options.c
+--- cacao/cacao/src/vm/options.c	2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/options.c	2016-01-03 11:48:06.439004345 +0000
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ #include <limits.h>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -56,9 +57,9 @@
+ 
+ bool opt_run = true;
+ 
+-s4   opt_heapmaxsize   = 0;     /* maximum heap size                          */
+-s4   opt_heapstartsize = 0;     /* initial heap size                          */
+-s4   opt_stacksize     = 0;     /* thread stack size                          */
++size_t opt_heapmaxsize   = 0;   /* maximum heap size                          */
++size_t opt_heapstartsize = 0;   /* initial heap size                          */
++size_t opt_stacksize     = 0;   /* thread stack size                          */
+ 
+ bool opt_verbose = false;
+ bool opt_debugcolor = false;	/* use ANSI terminal sequences 		      */
+diff -Naur cacao/cacao/src/vm/options.h cacao/cacao/src/vm/options.h
+--- cacao/cacao/src/vm/options.h	2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/options.h	2016-01-03 11:48:55.397204706 +0000
+@@ -32,6 +32,7 @@
+ extern "C" {
+ #endif
+ 
++#include <stddef.h>
+ #include <stdint.h>
+ 
+ #include "vm/types.h"
+@@ -82,9 +83,9 @@
+ extern bool opt_jar;
+ extern bool opt_run;
+ 
+-extern s4   opt_heapmaxsize;
+-extern s4   opt_heapstartsize;
+-extern s4   opt_stacksize;
++extern size_t opt_heapmaxsize;
++extern size_t opt_heapstartsize;
++extern size_t opt_stacksize;
+ 
+ extern bool opt_verbose;
+ extern bool opt_debugcolor;
+diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp	2013-01-10 16:45:14.000000000 +0000
++++ cacao/cacao/src/vm/vm.cpp	2016-01-03 11:50:15.779891441 +0000
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ 
++#include <stddef.h>
+ #include <stdint.h>
+ 
+ #include <exception>
+@@ -33,6 +34,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ 
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+ 
+ #include "arch.h"
+@@ -699,6 +704,19 @@
+ 	opt_heapstartsize = HEAP_STARTSIZE;
+ 	opt_stacksize     = STACK_SIZE;
+ 
++#if defined(__LINUX__)
++	// Calculate 1/4 of the physical memory.
++	size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++	if (qmem > INT32_MAX) {
++		// Allocate no more than 2GB.
++		opt_heapmaxsize = INT32_MAX;
++	} else if (qmem > HEAP_MAXSIZE) {
++		// Otherwise use this if greater than default (128MB).
++		opt_heapmaxsize = qmem;
++	}
++#endif
++
+ 	// First of all, parse the -XX options.
+ 
+ #if defined(ENABLE_VMLOG)
+@@ -914,18 +932,33 @@
+ 		case OPT_SS:
+ 			{
+ 				char c;
+-				int j;
++				size_t j;
+ 
++				errno = 0;
+ 				c = opt_arg[strlen(opt_arg) - 1];
++				j = strtoul(opt_arg, NULL, 10);
++
++				if (errno)
++					break; // Invalid.
+ 
+ 				if ((c == 'k') || (c == 'K')) {
+-					j = atoi(opt_arg) * 1024;
++					if (j > SIZE_MAX / 1024)
++						break; // Overflow.
++					else
++						j *= 1024;
+ 
+ 				} else if ((c == 'm') || (c == 'M')) {
+-					j = atoi(opt_arg) * 1024 * 1024;
+-
+-				} else
+-					j = atoi(opt_arg);
++					if (j > SIZE_MAX / 1024 / 1024)
++						break; // Overflow.
++					else
++						j *= 1024 * 1024;
++
++				} else if ((c == 'g') || (c == 'G')) {
++					if (j > SIZE_MAX / 1024 / 1024 / 1024)
++						break; // Overflow.
++					else
++						j *= 1024 * 1024 * 1024;
++				}
+ 
+ 				if (opt == OPT_MX)
+ 					opt_heapmaxsize = j;
+@@ -1525,9 +1558,9 @@
+ void VM::print_run_time_config()
+ {
+ 	puts("Run-time variables:\n");
+-	printf("  maximum heap size              : %d\n", opt_heapmaxsize);
+-	printf("  initial heap size              : %d\n", opt_heapstartsize);
+-	printf("  stack size                     : %d\n", opt_stacksize);
++	printf("  maximum heap size              : %lu\n", opt_heapmaxsize);
++	printf("  initial heap size              : %lu\n", opt_heapstartsize);
++	printf("  stack size                     : %lu\n", opt_stacksize);
+ 
+ #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ 	printf("  gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
deleted file mode 100644
index edce1e85234a..000000000000
--- a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User James Le Cuirot <chewi@gentoo.org>
-# Date 1441541110 -3600
-#      Sun Sep 06 13:05:10 2015 +0100
-# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211
-# Parent  468081e3e037df27b6427aa298dfaaa20f4ba4bf
-Dynamically set the maximum heap size on Linux
-
-diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp
---- cacao/cacao/src/vm/vm.cpp	Wed Jun 10 19:52:58 2015 +0200
-+++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:05:10 2015 +0100
-@@ -32,6 +32,10 @@
- #include <stdint.h>
- #include <inttypes.h>
- 
-+#if defined(__LINUX__)
-+#include <unistd.h>
-+#endif
-+
- #include "md-abi.hpp"
- 
- #include "mm/codememory.hpp"
-@@ -690,6 +694,19 @@
- 	opt_heapstartsize = HEAP_STARTSIZE;
- 	opt_stacksize     = STACK_SIZE;
- 
-+#if defined(__LINUX__)
-+	// Calculate 1/4 of the physical memory.
-+	uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
-+
-+	if (qmem > INT32_MAX) {
-+		// More than 2GB will overflow so cap it.
-+		opt_heapmaxsize = 2047 * 1024 * 1024;
-+	} else if (qmem > HEAP_MAXSIZE) {
-+		// Otherwise use this if greater than default (128MB).
-+		opt_heapmaxsize = (s4) qmem;
-+	}
-+#endif
-+
- 	// First of all, parse the -XX options.
- 	options_xx(vm_args);
- 
diff --git a/dev-java/icedtea/files/7-cacao-pr-157.patch b/dev-java/icedtea/files/7-cacao-pr-157.patch
new file mode 100644
index 000000000000..0701363cf38a
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-pr-157.patch
@@ -0,0 +1,139 @@
+diff -Naur cacao/cacao/src/vm/options.cpp cacao/cacao/src/vm/options.cpp
+--- cacao/cacao/src/vm/options.cpp	2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/options.cpp	2015-12-23 21:01:37.644275263 +0000
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ #include <limits.h>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -60,9 +61,9 @@
+ 
+ bool opt_run = true;
+ 
+-s4   opt_heapmaxsize   = 0;     /* maximum heap size                          */
+-s4   opt_heapstartsize = 0;     /* initial heap size                          */
+-s4   opt_stacksize     = 0;     /* thread stack size                          */
++size_t opt_heapmaxsize   = 0;   /* maximum heap size                          */
++size_t opt_heapstartsize = 0;   /* initial heap size                          */
++size_t opt_stacksize     = 0;   /* thread stack size                          */
+ 
+ bool opt_verbose = false;
+ bool opt_debugcolor = false;	/* use ANSI terminal sequences 		      */
+diff -Naur cacao/cacao/src/vm/options.hpp cacao/cacao/src/vm/options.hpp
+--- cacao/cacao/src/vm/options.hpp	2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/options.hpp	2015-12-23 21:01:37.645275246 +0000
+@@ -26,6 +26,7 @@
+ #ifndef OPTIONS_HPP_
+ #define OPTIONS_HPP_ 1
+ 
++#include <stddef.h>                     // for size_t
+ #include <stdint.h>                     // for int64_t
+ #include <stdio.h>                      // for FILE
+ #include "config.h"                     // for ENABLE_DEBUG_FILTER, etc
+@@ -77,9 +78,9 @@
+ extern bool opt_jar;
+ extern bool opt_run;
+ 
+-extern s4   opt_heapmaxsize;
+-extern s4   opt_heapstartsize;
+-extern s4   opt_stacksize;
++extern size_t opt_heapmaxsize;
++extern size_t opt_heapstartsize;
++extern size_t opt_stacksize;
+ 
+ extern bool opt_verbose;
+ extern bool opt_debugcolor;
+diff -Naur cacao/cacao/src/vm/vm.cpp cacao/cacao/src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp	2014-12-12 21:14:45.000000000 +0000
++++ cacao/cacao/src/vm/vm.cpp	2015-12-23 21:01:38.046268504 +0000
+@@ -29,9 +29,14 @@
+ #include <cerrno>
+ #include <cstdlib>
+ #include <exception>
++#include <stddef.h>
+ #include <stdint.h>
+ #include <inttypes.h>
+ 
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "md-abi.hpp"
+ 
+ #include "mm/codememory.hpp"
+@@ -690,6 +695,19 @@
+ 	opt_heapstartsize = HEAP_STARTSIZE;
+ 	opt_stacksize     = STACK_SIZE;
+ 
++#if defined(__LINUX__)
++	// Calculate 1/4 of the physical memory.
++	size_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++	if (qmem > INT32_MAX) {
++		// Allocate no more than 2GB.
++		opt_heapmaxsize = INT32_MAX;
++	} else if (qmem > HEAP_MAXSIZE) {
++		// Otherwise use this if greater than default (128MB).
++		opt_heapmaxsize = qmem;
++	}
++#endif
++
+ 	// First of all, parse the -XX options.
+ 	options_xx(vm_args);
+ 
+@@ -896,18 +914,33 @@
+ 		case OPT_SS:
+ 			{
+ 				char c;
+-				int j;
++				size_t j;
+ 
++				errno = 0;
+ 				c = opt_arg[strlen(opt_arg) - 1];
++				j = strtoul(opt_arg, NULL, 10);
++
++				if (errno)
++					break; // Invalid.
+ 
+ 				if ((c == 'k') || (c == 'K')) {
+-					j = atoi(opt_arg) * 1024;
++					if (j > SIZE_MAX / 1024)
++						break; // Overflow.
++					else
++						j *= 1024;
+ 
+ 				} else if ((c == 'm') || (c == 'M')) {
+-					j = atoi(opt_arg) * 1024 * 1024;
+-
+-				} else
+-					j = atoi(opt_arg);
++					if (j > SIZE_MAX / 1024 / 1024)
++						break; // Overflow.
++					else
++						j *= 1024 * 1024;
++
++				} else if ((c == 'g') || (c == 'G')) {
++					if (j > SIZE_MAX / 1024 / 1024 / 1024)
++						break; // Overflow.
++					else
++						j *= 1024 * 1024 * 1024;
++				}
+ 
+ 				if (opt == OPT_MX)
+ 					opt_heapmaxsize = j;
+@@ -1498,9 +1531,9 @@
+ void VM::print_run_time_config()
+ {
+ 	puts("Run-time variables:\n");
+-	printf("  maximum heap size              : %d\n", opt_heapmaxsize);
+-	printf("  initial heap size              : %d\n", opt_heapstartsize);
+-	printf("  stack size                     : %d\n", opt_stacksize);
++	printf("  maximum heap size              : %lu\n", opt_heapmaxsize);
++	printf("  initial heap size              : %lu\n", opt_heapstartsize);
++	printf("  stack size                     : %lu\n", opt_stacksize);
+ 
+ #if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ 	printf("  gnu.classpath.boot.library.path: %s\n", _properties.get("gnu.classpath.boot.library.path"));
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
rename to dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
index 403ef6b2dfeb..552d4aac349d 100644
--- a/dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r2.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$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -206,7 +206,7 @@ src_configure() {
 		cacao_config="--enable-cacao"
 
 		# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2611
-		export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+		export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
 		ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
 	fi
 
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
similarity index 98%
rename from dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
index 684c6e893d09..d32b642aa1ff 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r3.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$
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] )
 	pulseaudio? ( dev-java/icedtea-sound )"
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -266,7 +266,7 @@ src_configure() {
 		cacao_config="--enable-cacao"
 
 		# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612
-		export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
+		export DISTRIBUTION_PATCHES="${SLOT}-cacao-pr-157.patch"
 		ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
 	fi
 
diff --git a/dev-java/milton-api/Manifest b/dev-java/milton-api/Manifest
index 535318af0b4f..1b952564ac3d 100644
--- a/dev-java/milton-api/Manifest
+++ b/dev-java/milton-api/Manifest
@@ -1,2 +1 @@
-DIST milton-api-2.5.1.5-sources.jar 210148 SHA256 e55d3919b6852206137121f0bf240607b82011bc4a21f1ac4f58be247ba0d221 SHA512 2cfc5cf5b81e36055871351cabced0b83e0c24aff3adb222cbb9a22d13bb19619e315606ccfbd4d0b14d3951deeb51442fa86fb587ecedd7cfbbc5ee54b76803 WHIRLPOOL 0c74aabff88f7b5d586d369cdc074bc227b3b0b1303268f90e52ea1b2bf42f3c53323ffdd8d8f31d626b18aeb5e2d2b0d7ee3426c409b62b6b3f07939961dc5e
-DIST milton-api-2.6.5.5-sources.jar 227823 SHA256 bfd1fd7cd0560024cb64630e3660873d13033cc18d783a6f3deda2dfa7784e59 SHA512 66730e025399039537b31f635546375939e98c27e4250283342d8dec350a682368f5991d969dfecce9ab45f541d2da448f9786c8265ae55caa742f887a97899f WHIRLPOOL ed9578e52c477675f55209e5223b744a967f616f3d2b17aea87145ceac32cc69516535261a599814ca7a0e86d01adaa30ec2c96b3be0a280b9199b8fb09345a2
+DIST milton-api-2.7.1.3-sources.jar 240367 SHA256 56d79201eff9d2287ae4a516f2d70c71d5813e20b1c5b669f16acad7b522d5cb SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08 WHIRLPOOL d191a43b4c3d108f933f900a1a48a43cb8ce86e94bc84227152e89ba4bf7b7e38f95af67f61735ee174106ef7c92bfdca733a63c17359a43d06d2c62a174c564
diff --git a/dev-java/milton-api/milton-api-2.5.1.5.ebuild b/dev-java/milton-api/milton-api-2.5.1.5.ebuild
deleted file mode 100644
index d44d58f3dd5a..000000000000
--- a/dev-java/milton-api/milton-api-2.5.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/commons-codec:0
-	dev-java/commons-io:1
-	dev-java/slf4j-api:0
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-api/milton-api-2.6.5.5.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
similarity index 78%
rename from dev-java/milton-api/milton-api-2.6.5.5.ebuild
rename to dev-java/milton-api/milton-api-2.7.1.3.ebuild
index 4e2f26b160cc..bc54c3b25fe7 100644
--- a/dev-java/milton-api/milton-api-2.6.5.5.ebuild
+++ b/dev-java/milton-api/milton-api-2.7.1.3.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 @@ HOMEPAGE="http://milton.io"
 SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="Apache-2.0"
-SLOT="2.6"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE=""
@@ -24,10 +24,12 @@ CDEPEND="
 	dev-java/slf4j-api:0
 "
 
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-mail-api/Manifest b/dev-java/milton-mail-api/Manifest
index 37c7d48ee1fc..0b8b68489758 100644
--- a/dev-java/milton-mail-api/Manifest
+++ b/dev-java/milton-mail-api/Manifest
@@ -1 +1 @@
-DIST milton-mail-api-2.5.1.5-sources.jar 34106 SHA256 537fd8b99b29574705be8c82ffd5d447bbcc009f4d94fd9b2b53540177dab868 SHA512 c2f244f7fb500828ed26cdc254de428324f560a9f9809373b8aca0fb1a71a70bc748e0155f4c68448307bc272dd7b671a1003522b6eacf8c41cdea116f5ebd5d WHIRLPOOL 9a29b4ffbd6fd457b2bf59b4f71d8a42c0037ff566dd8f95bbc400f3a8a873b28daa20e8757dc323855812c73087490bfb6c9226c6b26699e526aebb19d03911
+DIST milton-mail-api-2.7.1.3-sources.jar 34106 SHA256 4947db22c73db8f7b8fbf3d549b62d622c7ec33a42a774662e60bb8bce88153a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67 WHIRLPOOL 7109d5a62f919503ad21a557e7e15f0428afe1ae72f9a8129dd58ec551d684934e8d48095c86d0d5cb2c250163c143e6ea7af6d172152b5e60fa7aa643a9eb86
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
similarity index 71%
rename from dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild
rename to dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
index f242270479a4..477761825a70 100644
--- a/dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild
+++ b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.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,25 +13,27 @@ HOMEPAGE="http://milton.io"
 SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
 
 LICENSE="Apache-2.0"
-SLOT="2.5"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
 CDEPEND="
-	dev-java/milton-api:${SLOT}
 	dev-java/slf4j-api:0
+	dev-java/milton-api:0
 	dev-java/oracle-javamail:0
 "
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 JAVA_GENTOO_CLASSPATH="
-	milton-api-${SLOT}
-	oracle-javamail
 	slf4j-api
+	milton-api
+	oracle-javamail
 "
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a60e55e5549f..95f848f11510 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,2 +1,3 @@
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
 DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e
+DIST R-3.2.3.tar.gz 29816176 SHA256 b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1 SHA512 9d7294af860204f4d84e25eb503111c9607beedbc42f01de073c915945a6342c3e24e25a9cc038a2e58442036bee931975d93dc327081ed02afe5ffa365170ea WHIRLPOOL 31ecbaa5c4340e02551eefe17f7f2e9ae075778e7b568a2c477b9f31f1b9598380edb8cb53c713df6643d2cba62ea97c6f225490ade2fc8a9e2b4d88426c7883
diff --git a/dev-lang/R/R-3.2.3.ebuild b/dev-lang/R/R-3.2.3.ebuild
new file mode 100644
index 000000000000..c8227c911b10
--- /dev/null
+++ b/dev-lang/R/R-3.2.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+
+BCP=${PN}-20130129.bash_completion
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="
+	mirror://cran/src/base/R-3/${P}.tar.gz
+	https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
+REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
+
+CDEPEND="
+	app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	app-text/ghostscript-gpl
+	>=dev-libs/libpcre-8.35:3=
+	virtual/blas:0
+	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
+	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
+	icu? ( dev-libs/icu:= )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack:0 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0= )
+	readline? ( sys-libs/readline:0= )
+	tiff? ( media-libs/tiff:0= )
+	tk? ( dev-lang/tk:0= )
+	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+	)"
+
+RDEPEND="${CDEPEND}
+	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+	# Temporary fix for bug #419761
+	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+		append-flags -fno-ipa-cp-clone
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
+		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
+		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -i \
+		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -i \
+		-e 's:\.\./manual/:manual/:g' \
+		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -i \
+				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-e "/SHLIB_EXT/s/\.so/.dylib/" \
+				configure.ac || die
+			# sort of "undo" 2.14.1-rmath-shared.patch
+			sed -i \
+				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+				src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+	AT_M4DIR=m4 eaclocal
+	eautoconf
+}
+
+src_configure() {
+	#	--with-system-tre \
+	# tre is patched from upstream
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--with-system-pcre \
+		--with-system-xz \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
+		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone \
+		shared $(use static-libs && echo static) AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${R_DIR}/lib
+		R_HOME=${R_DIR}
+	EOF
+	doenvd 99R
+	newbashcomp "${WORKDIR}"/${BCP} ${PN}
+	# The buildsystem has a different understanding of install_names than
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/lib/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+	docompress -x /usr/share/doc/${PF}/NEWS.rds
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 27a1762c352d..27ffb97a7f87 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -6,3 +6,4 @@ DIST MoarVM-2015.05.tar.gz 3150053 SHA256 828843eb3da020ee24ff83933b63aebf4aa774
 DIST MoarVM-2015.06.tar.gz 3155073 SHA256 8dfe52630a3fcc749b653591f8a4e7fa723cd204cf0f6133b62b70d1b9c5980f SHA512 427e036fcee06b65642c9e07ea687c28593a432e2b6f1ee0bc503f6ce32f93f77219bb9e80aec1d1300dc0ba4b92cc467a04896a0ead4b2ef89656d6844913ad WHIRLPOOL cf6af05afd5eb872954d9e9fcb86d06061e9b7ab80799afdeb10f6e255d15766d6def2054c3e3e79be83fc61d036bc39b14cf57e9f32a7a6c47046a6b90d03e6
 DIST MoarVM-2015.07.tar.gz 3225835 SHA256 310a4ea6dbaacaf1837606edf6c42170143f60c8e29eb94c7e6fea810b6af10b SHA512 304d6ce5c50a5091daa02dab0fe328875d392fee29aed397db530324c51b909529ede9f703f18f43bbc398c70ec85958ffed3a8bc06d77e29ec193561165b581 WHIRLPOOL 6036fb9cba88a12edc3c5332d706cd11e6604d418217f880f9b409e16b22fd4610bc6c8e606888d69ccee9dbd7836d9ebcc3006a8bf6cce766334192ff3e7f52
 DIST MoarVM-2015.11.tar.gz 3261494 SHA256 eca0efcd620c51909b6caea8e3c8085f0de1dbb629dc064bea3a916a9bead5cf SHA512 338f220a0462431425c3c999233470686d342899e56473f9beb3d8a509daf25866b5c4419e28a1f3a4902526690e80b581b8567d6327d49b4c4b9a81eb932569 WHIRLPOOL a03c22ef4fd15864c141df7867cf4089da8382fb457179bdafd95cb2625d69df3a252bf41caa0327ea20ec664aa5ab1553eadb8d59c5ebb0942a8758f143e372
+DIST MoarVM-2015.12.tar.gz 3273408 SHA256 4e4f106ec0802dfda5206fea811d260cc1111fe4cfa13b038af9077d8ad56826 SHA512 cd51dc2495a2f897ecff3ae46ff4334a840d52de6f3c492473bbd4d0b2fc5dffe4e671b008bd5baa623ba7017bf995900898f690b0b93a827559f43525e421f4 WHIRLPOOL f417c188d76a5e7f4d80141942fd6ab2571b3aa4a67923ee2cff48c9ebd0cfbc919037a456692143aa2c5a524c6f36198b5fb36f9b676db74dceb1fb263a0c17
diff --git a/dev-lang/moarvm/moarvm-2015.12.ebuild b/dev-lang/moarvm/moarvm-2015.12.ebuild
new file mode 100644
index 000000000000..af545660fe2e
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2015.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_PN="MoarVM"
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/MoarVM-${PV}"
+
+src_configure() {
+	perl Configure.pl --prefix="${D}/usr"|| die
+}
+
+src_install() {
+	emake install
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 310ed209e4d4..ec3dad01786d 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -6,3 +6,4 @@ DIST nqp-2015.05.tar.gz 4985712 SHA256 ad54f05422d0fbe14483b91de26c195a2d7e21e19
 DIST nqp-2015.06.tar.gz 4986918 SHA256 07dd6ea9762c9a3d5e477472cd65584b5e00fef1403c540d2b4ce802c2cc9d26 SHA512 f5d8e9dc057d303745d691eb6f92222c6586077a8f5c3ce0bf8557f715fa7e9ddea6a333e7db1743ed9982189e13e920c0228b40e22bfd3eac9b889a589bc3cb WHIRLPOOL a8164398f54fbc1609f52352e01112681390959a53b1c3d61192800ad2ec40e3ac79c2cb67108f10ab3bd277a540b52aa16e2d989461a860990cef5c92f02b3a
 DIST nqp-2015.07.2.tar.gz 5001361 SHA256 45cde1880b314d98dd20062e93ef28f083dbf2239784e8f050456df8520a25c1 SHA512 b40ad51e37504b0c05e3d27c7a09543bb4735b3d8758a34805034600e362ae327434584f6824ef72587c37de5b51b476dbb05e8f0f248dc49ed64449f2ba1917 WHIRLPOOL 692f4ac9c669f7cf3b56e81b659f4b1d50296b4dccf9effa6f08aca9082f3b501fad140f7411e9ddbada15a5c458be21b699e850ed04574ed53699d2d28be084
 DIST nqp-2015.11.tar.gz 5113497 SHA256 f9a5e33e628d56b1210a049363198ed05b465024d4f259809f1b1617eb49b568 SHA512 94f464c055b308ee408240d3cbb7e30b71de99c14e97b5bbaa5fbbe4bc021f60b5567de0113628e2dfb89152eb6a00c8d0cfee92c3b54c5c5fd473c2f00e2cf7 WHIRLPOOL 57151fe290dc6674cb10b190349d8809cff90d10385500fda7772d2d78539d492b18be49d1bd903a96c6a9d1bc26a797f7cf3f956891b0af3820c70ce7307d7d
+DIST nqp-2015.12.tar.gz 5135635 SHA256 4d77681ec4e0fa0c91bf346ab2bb076981921d29e1fbb9964a2a025d7283bbb7 SHA512 97ef4a52b2b7b461f57cbc2c80f3d2b0056125960c77527f1c9ea2ab21f1882bbeb238e7a5b50c7cd88ac60f74a2b600b85ae9ba70db0209b90a91d68b49216d WHIRLPOOL 79257972580ba0737bb2be7eb2cae3203ae9feefa8e268d5f3ef688ba8cfd9b7aa8126e9431a1d4ef7274f9a93a4751741efd79314b300bca177dd3de5e37018
diff --git a/dev-lang/nqp/nqp-2015.12.ebuild b/dev-lang/nqp/nqp-2015.12.ebuild
new file mode 100644
index 000000000000..94d7ff9701e3
--- /dev/null
+++ b/dev-lang/nqp/nqp-2015.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# still not working
+RESTRICT="test"
+
+inherit eutils multilib versionator
+
+GITCRAP=a54e409
+PARROT_VERSION="6.7.0"
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc parrot java +moar"
+REQUIRED_USE="|| ( parrot java moar )"
+
+RDEPEND="parrot? ( >=dev-lang/parrot-${PARROT_VERSION}:=[unicode] )
+	java? ( >=virtual/jre-1.7 )
+	moar? ( =dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+S=${WORKDIR}/perl6-nqp-${GITCRAP}
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use parrot && myconf+="parrot,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backend=${myconf} --prefix=/usr || die
+	# dirty hack to make dyncall not fail
+	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
+	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
+	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
+
+	# more dirty hack to allow building with newer gcc
+	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
+	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc -r docs/* || die
+	fi
+}
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r3.ebuild
deleted file mode 100644
index f0723ccf511e..000000000000
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-	berkdb? ( || (
-		sys-libs/db:5.3
-		sys-libs/db:5.2
-		sys-libs/db:5.1
-		sys-libs/db:5.0
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-		sys-libs/db:4.6
-		sys-libs/db:4.5
-		sys-libs/db:4.4
-		sys-libs/db:4.3
-		sys-libs/db:4.2
-	) )
-	gdbm? ( sys-libs/gdbm[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2
-		readline? ( >=sys-libs/readline-4.1 )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tk? (
-		>=dev-lang/tk-8.0
-		dev-tcltk/blt
-		dev-tcltk/tix
-	)
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
-	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${SLOT}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.10-r5.ebuild b/dev-lang/python/python-2.7.10-r5.ebuild
deleted file mode 100644
index e4d9824406d6..000000000000
--- a/dev-lang/python/python-2.7.10-r5.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
-	virtual/libintl
-	berkdb? ( || (
-		sys-libs/db:5.3
-		sys-libs/db:5.2
-		sys-libs/db:5.1
-		sys-libs/db:5.0
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-		sys-libs/db:4.6
-		sys-libs/db:4.5
-		sys-libs/db:4.4
-		sys-libs/db:4.3
-		sys-libs/db:4.2
-	) )
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:0=
-		>=dev-lang/tk-8.0:0=
-		dev-tcltk/blt:0=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1 )
-	!!<sys-apps/portage-2.1.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND=">=app-eselect/eselect-python-20151117-r1
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-	rm -r Modules/zlib || die
-
-	if tc-is-cross-compiler; then
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	# Fix for cross-compiling.
-	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
-	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
-	epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	cd "${BUILD_DIR}" || die
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
-	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
-	rm -f "${ED}usr/bin/smtpd.py"
-
-		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
-		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
-		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${SLOT}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${SLOT%.*}
-	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
-	# python and pythonX
-	ln -s "../../../bin/python${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-	ln -s "python${pymajor}" \
-		"${D}${PYTHON_SCRIPTDIR}/python" || die
-	# python-config and pythonX-config
-	ln -s "../../../bin/python${SLOT}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
-	ln -s "../../../bin/pydoc${SLOT}" \
-		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${D}${PYTHON_SCRIPTDIR}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn "You should switch active version of Python ${PV%%.*} and run"
-		ewarn "'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-2.7.11-r1.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
similarity index 99%
rename from dev-lang/python/python-2.7.11-r1.ebuild
rename to dev-lang/python/python-2.7.11-r2.ebuild
index 3cf1079074b2..8f8ae73215ad 100644
--- a/dev-lang/python/python-2.7.11-r1.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -340,7 +340,7 @@ src_install() {
 		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
 	# idle
 	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
+		ln -s "../../../bin/idle${SLOT}" \
 			"${D}${PYTHON_SCRIPTDIR}/idle" || die
 	fi
 }
diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild
deleted file mode 100644
index 37e68f3b95fd..000000000000
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="${PV}-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
-	mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	!build? (
-		gdbm? ( sys-libs/gdbm[berkdb] )
-		ncurses? (
-			>=sys-libs/ncurses-5.2:0
-			readline? ( >=sys-libs/readline-4.1 )
-		)
-		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? ( dev-libs/openssl )
-		tk? (
-			>=dev-lang/tk-8.0
-			dev-tcltk/blt
-			dev-tcltk/tix
-		)
-		xml? ( >=dev-libs/expat-2.1 )
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )
-	doc? ( dev-python/python-docs:${SLOT} )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	# bug #514686
-	epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
-
-	epatch_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ "${result}" -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	if use build; then
-		rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
-	else
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-	fi
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${PYVER}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-		ewarn
-		ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.3.5-r2.ebuild b/dev-lang/python/python-3.3.5-r2.ebuild
index f35f7efc7e10..79a844f6022c 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -19,8 +19,8 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -35,14 +35,11 @@ RDEPEND="app-arch/bzip2
 	!build? (
 		gdbm? ( sys-libs/gdbm[berkdb] )
 		ncurses? (
-			>=sys-libs/ncurses-5.2
+			>=sys-libs/ncurses-5.2:0
 			readline? ( >=sys-libs/readline-4.1 )
 		)
 		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-		ssl? (
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-		)
+		ssl? ( dev-libs/openssl )
 		tk? (
 			>=dev-lang/tk-8.0
 			dev-tcltk/blt
@@ -75,7 +72,6 @@ src_prepare() {
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
@@ -94,8 +90,6 @@ src_prepare() {
 	# bug #514686
 	epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
 
-	epatch "${FILESDIR}"/${PN}-3.3-libressl.patch
-
 	epatch_user
 
 	eautoconf
@@ -296,7 +290,7 @@ src_install() {
 		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	python_export "python${PYVER}" "${vars[@]}"
+	python_export "python${SLOT}" "${vars[@]}"
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
similarity index 99%
rename from dev-lang/python/python-3.4.3.ebuild
rename to dev-lang/python/python-3.4.3-r1.ebuild
index 67231a25b429..0f32b9467bb0 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -285,7 +285,7 @@ src_install() {
 		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	python_export "python${PYVER}" "${vars[@]}"
+	python_export "python${SLOT}" "${vars[@]}"
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.4.3-r2.ebuild b/dev-lang/python/python-3.4.3-r2.ebuild
deleted file mode 100644
index aea8b53602d9..000000000000
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	>=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	xml? ( >=dev-libs/expat-2.1 )
-	gdbm? ( sys-libs/gdbm[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2
-		readline? ( >=sys-libs/readline-4.1 )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tk? (
-		>=dev-lang/tk-8.0
-		dev-tcltk/blt
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
-	app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# Disable ABI flags.
-	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	ECONF_SOURCE="${S}" OPT="" \
-	econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-computed-gotos \
-		--with-dbmliborder="${dbmliborder}" \
-		--with-libc="" \
-		--enable-loadable-sqlite-extensions \
-		--with-system-expat \
-		--with-system-ffi \
-		--without-ensurepip
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c || die
-
-	cd "${BUILD_DIR}" || die
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
-	# Backwards compat with Gentoo divergence.
-	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-		use elibc_uclibc && rm -fr "${libdir}/test"
-		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${SLOT}:" \
-		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${PYVER}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild b/dev-lang/python/python-3.5.0-r2.ebuild
similarity index 99%
rename from dev-lang/python/python-3.5.0-r1.ebuild
rename to dev-lang/python/python-3.5.0-r2.ebuild
index e67b55e388e6..cde95c3b5aca 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -283,7 +283,7 @@ src_install() {
 		vars=( PYTHON "${vars[@]}" )
 	fi
 
-	python_export "python${PYVER}" "${vars[@]}"
+	python_export "python${SLOT}" "${vars[@]}"
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 }
diff --git a/dev-lang/python/python-3.5.0-r5.ebuild b/dev-lang/python/python-3.5.0-r5.ebuild
deleted file mode 100644
index 2ed98982edbe..000000000000
--- a/dev-lang/python/python-3.5.0-r5.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.5.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.5/3.5m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:0=
-	app-arch/xz-utils:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libffi
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:0=[berkdb] )
-	ncurses? (
-		>=sys-libs/ncurses-5.2:0=
-		readline? ( >=sys-libs/readline-4.1:0= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:0=
-		>=dev-lang/tk-8.0:0=
-		dev-tcltk/blt:0=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:0= )
-	!!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20151117-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-PYVER=${SLOT%/*}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if tc-is-cross-compiler; then
-		# Invokes BUILDPYTHON, which is built for the host arch
-		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
-	epatch "${FILESDIR}/3.5-secondary-targets.patch"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		configure.ac \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/getpath.c \
-		Modules/Setup.dist \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	#sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	use gdbm     || disable+=" gdbm"
-	use ncurses  || disable+=" _curses _curses_panel"
-	use readline || disable+=" readline"
-	use sqlite   || disable+=" _sqlite3"
-	use ssl      || export PYTHON_DISABLE_SSL="1"
-	use tk       || disable+=" _tkinter"
-	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	BUILD_DIR="${WORKDIR}/${CHOST}"
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-
-	local myeconfargs=(
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Avoid regenerating these for cross-compiles
-	touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die
-
-	cd "${BUILD_DIR}" || die
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	cd "${BUILD_DIR}" || die
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
-	cd "${BUILD_DIR}" || die
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	use elibc_uclibc && rm -fr "${libdir}/test"
-	use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
-	use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
-	use threads || rm -fr "${libdir}/multiprocessing"
-	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
-	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
-		doins -r "${S}"/Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# for python-exec
-	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-	else
-		vars=( PYTHON "${vars[@]}" )
-	fi
-
-	python_export "python${PYVER}" "${vars[@]}"
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-	ln -s "python${pymajor}" \
-		"${D}${PYTHON_SCRIPTDIR}/python" || die
-	# python-config and pythonX-config
-	ln -s "../../../bin/${abiver}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${D}${PYTHON_SCRIPTDIR}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${D}${PYTHON_SCRIPTDIR}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${D}${PYTHON_SCRIPTDIR}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 58499ac360c9..c338461f1879 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -6,3 +6,4 @@ DIST rakudo-2015.05.tar.gz 2503009 SHA256 81ecf442e5c1720d8112effc5531f171c83907
 DIST rakudo-2015.06.tar.gz 2505308 SHA256 eea69522bc415a2566acb7277db44e5e0df558b3f3d667b64c4e700e917d18fa SHA512 1fb7f6fa42cc71977c26663ae38f5421b390781825e8acd0a0fae9c2781aa06018db3b474a0da43eb519eeb1aed8220df686968e2484272df095e21476b3023d WHIRLPOOL afea51402961a0ca2428a9e8ea5bda48b23b955fb04ad86aeb002b2a387c98931c3e03de24dda247b42a4e00ce772234f52bf6cb76f2951b28f57bef8908b56c
 DIST rakudo-2015.07.2.tar.gz 2539175 SHA256 1794f2d670af1174aee620587270c05fbc06ef3026ae144daac436101856c492 SHA512 2e487df689c40b45673fc14a66127f893a5b0db13c5747e030dbc4b293cec76114b88909598f2ac7d607e7fe6d8fa632ee0c7386a064da31e76feeec48406d5f WHIRLPOOL bfa2ae4c3f5e24f641eaf8c52d96e61c9cfc48d4ecd9fcacae5a19ed1f60d636d3241fddf2bcbf40df2f2b98add912992c8e955dd237b7583af38c17bbb6713c
 DIST rakudo-2015.11.tar.gz 2643309 SHA256 a27c8357d06ebfcd1337003c869686f5041aba563a3a8c57bc3c555334e43bc3 SHA512 e4d662709cf47b2b98398c5781973d1abd008f6f13b170fdba418bf36ff552e6c33caee26e2833539828c06ab7562f02cf5e54789f898e2e2d1d31db98d2e95e WHIRLPOOL 22fdaaf616dc62606ca320cb08231b2ae0740e4191f238f2fa26247b2fcd45ae061a2b4f1c616181ea68339a45054751fef0ebab825e98580ecede43c039805e
+DIST rakudo-2015.12.tar.gz 2669528 SHA256 f8a57a7b543416c8ea623644f3d74673c4e6c68f3b0161a6b963550ecb74781b SHA512 48e4c98bbff67a52f68a835cc87a19a0b17f2d67790f8162ffd9f167f080d09180d375b5ea9a8577d1de5036c78e604473a2140107d448aff3630c138fd16114 WHIRLPOOL 351ab7ff4b4a1ff00195f913d48f87ef620888cf709e68df5b169f24256d5042bd4a89ef5b3595d9be32ed27cae2e87da9cf3f2585eec0823420be5ee6d8a1a3
diff --git a/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch b/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch
new file mode 100644
index 000000000000..2dfc05b7463c
--- /dev/null
+++ b/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch
@@ -0,0 +1,78 @@
+From fb00ed3d71f9407a776c82f03855d1242997878c Mon Sep 17 00:00:00 2001
+From: Anthony Parsons <flussence@gmail.com>
+Date: Sat, 26 Dec 2015 19:37:18 +0000
+Subject: [PATCH] Fix `make install` when nqp is distro-installed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+During the installation process, tools/build/install-core-dist.pl is called to
+precompile the bundled non-CORE.setting libraries such as Test.pm. The way this
+was initially coded, it pulled the install path from NQP's build-time
+configuration, which will be a root-owned filesystem path if NQP was installed
+via a system package manager.
+
+Other parts of the CompUnit code will see these paths don't exist, and attempt
+to helpfully call `mkdir` on them which brings the whole process to a messy end.
+This part usually works fine when building everything from a git checkout,
+because Moar/NQP/Rakudo all default to an installation prefix the user has write
+access to.
+
+This patch fixes that step of the build process by passing the makefile's path
+prefixes to install-core-dist.pl (ensuring precompilation output goes to the
+right place), and modifying it to *only* use that path (ensuring it doesn't try
+to mkdir where it shouldn't). This isn't a 100% solution, but it fixes enough
+to unblock packaging work on a few distros.
+
+Thanks to mst++ for doing almost all of the legwork here, crux++ for an initial
+patch that gave us a few pointers to work from, and nine++ for giving us some
+Boxing Day fun ☺
+---
+ tools/build/Makefile-JVM.in      | 2 +-
+ tools/build/Makefile-Moar.in     | 2 +-
+ tools/build/install-core-dist.pl | 3 ++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
+index 11e17810265d..0a3095114e0a 100644
+--- a/tools/build/Makefile-JVM.in
++++ b/tools/build/Makefile-JVM.in
+@@ -391,7 +391,7 @@ j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist.
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/resources
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/bin
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/short
+-	.@slash@$(J_RUNNER) tools/build/install-core-dist.pl
++	.@slash@$(J_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR)
+ 	$(PERL) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+ 	$(PERL) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+ 
+diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
+index 1e586d92a1fa..670b89c20774 100644
+--- a/tools/build/Makefile-Moar.in
++++ b/tools/build/Makefile-Moar.in
+@@ -246,7 +246,7 @@ m-install: m-all tools/build/create-moar-runner.pl tools/build/install-core-dist
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/resources
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/bin
+ 	$(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/short
+-	.@slash@$(M_RUNNER) tools/build/install-core-dist.pl
++	.@slash@$(M_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR)
+ 	$(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
+ 	$(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"
+ 	$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6-m$(M_BAT)
+diff --git a/tools/build/install-core-dist.pl b/tools/build/install-core-dist.pl
+index 0990b2676a10..ba14b20828d8 100644
+--- a/tools/build/install-core-dist.pl
++++ b/tools/build/install-core-dist.pl
+@@ -9,7 +9,8 @@ my %provides =
+     "experimental"               => "lib/experimental.pm6",
+ ;
+ 
+-CompUnit::RepositoryRegistry.repository-for-name('perl').install(
++PROCESS::<$REPO> := CompUnit::RepositoryRegistry.repository-for-spec("inst#@*ARGS[0]");
++$*REPO.install(
+     Distribution.new(
+         name     => "CORE",
+         auth     => "perl",
+-- 
+2.6.4
+
diff --git a/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch b/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch
new file mode 100644
index 000000000000..1c5f1af2c817
--- /dev/null
+++ b/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch
@@ -0,0 +1,27 @@
+From 4fe18ce14c87c4d63f18db3c38cf32733ba72c31 Mon Sep 17 00:00:00 2001
+From: Anthony Parsons <flussence@gmail.com>
+Date: Sun, 27 Dec 2015 02:02:22 +0000
+Subject: [PATCH 2/2] Add RAKUDO_PRECOMP_PREFIX env var
+
+As suggested by nine++, with some name tweaking
+---
+ docs/running.pod                        | 6 ++++++
+ src/core/CompUnit/RepositoryRegistry.pm | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/CompUnit/RepositoryRegistry.pm b/src/core/CompUnit/RepositoryRegistry.pm
+index f70f22105849..e628ee659c7c 100644
+--- a/src/core/CompUnit/RepositoryRegistry.pm
++++ b/src/core/CompUnit/RepositoryRegistry.pm
+@@ -75,7 +75,7 @@ class CompUnit::RepositoryRegistry {
+             }
+ #?endif
+ 
+-            my $prefix := nqp::p6box_s(
++            my $prefix := %*ENV<RAKUDO_PRECOMP_PREFIX> // nqp::p6box_s(
+               nqp::concat(nqp::atkey(nqp::backendconfig,'prefix'),'/share/perl6')
+             );
+ 
+-- 
+2.6.4
+
diff --git a/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch b/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch
new file mode 100644
index 000000000000..3b43b625de5b
--- /dev/null
+++ b/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch
@@ -0,0 +1,125 @@
+From c6d759c5df9ae4cb539717ecba99f80efe35d9ac Mon Sep 17 00:00:00 2001
+From: Anthony Parsons <flussence@gmail.com>
+Date: Sun, 27 Dec 2015 01:28:19 +0000
+Subject: [PATCH 1/2] Rewrite and complete the manpage's env var list
+
+This includes everything I could find with an `ack 'ENV<' src/` command.
+Descriptions have been expanded on, expected datatypes are shown, and items are
+now broken up into categories.
+---
+ docs/running.pod | 81 +++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 66 insertions(+), 15 deletions(-)
+
+diff --git a/docs/running.pod b/docs/running.pod
+index 9ed7571df54e..53fb577c8481 100644
+--- a/docs/running.pod
++++ b/docs/running.pod
+@@ -44,39 +44,90 @@ The supported values for C<--target> are:
+ For C<--profile-filename>, specifying a name ending in C<.json> will write a raw JSON profile dump.
+ The default if this is omitted is C<profile-I<[timestamp]>.html>.
+ 
+-=head1 List of env vars used in Rakudo
++=head1 ENVIRONMENT VARIABLES
++
++Rakudo's behavior can be tweaked by a (growing) number of environment variables; this section
++attempts to document all those currently in use.
++
++=head2 Module Loading
++
++=over
++
++=item C<RAKUDOLIB>, C<PERL6LIB> (I<Str>; F<src/core/Inc.pm>)
++
++Appends a comma-delimited list of paths to C<@INC>. C<RAKUDOLIB> is evaluated first.
++
++=item C<RAKUDO_MODULE_DEBUG> (I<Bool>; F<src/Perl6/ModuleLoader.pm>)
++
++Causes the module loader to print debugging information to standard error.
++
++=back
++
++=head2 Error Message Verbosity and Strictness
+ 
+ =over
+ 
+-=item C<RAKUDOLIB>, C<PERL6LIB> (src/core/Inc.pm)
++=item C<RAKUDO_NO_DEPRECATIONS> (I<Bool>; F<src/core/Deprecations.pm>)
++
++If true, suppresses deprecation warnings triggered by the C<is DEPRECATED> trait.
+ 
+-Appends a delimited list of paths to C<@INC>. C<RAKUDOLIB> is evaluated first.
++=item C<RAKUDO_DEPRECATIONS_FATAL> (I<Bool>; F<src/core/Deprecations.pm>)
+ 
+-=item C<RAKUDO_MODULE_DEBUG> (src/Perl6/ModuleLoader.pm)
++If true, deprecation warnings become thrown exceptions.
+ 
+-If set to a non-false value, causes the module loader to print debugging information to standard
+-error.
++=item C<RAKUDO_VERBOSE_STACKFRAME> (I<UInt>; F<src/core/Backtrace.pm>)
+ 
+-=item C<RAKUDO_ERROR_COLOR> (src/core/Exception.pm)
++Displays source code in stack frames surrounded by the specified number of lines of context.
++
++=item C<RAKUDO_BACKTRACE_SETTING> (I<Bool>; F<src/core/Backtrace.pm>)
++
++Controls whether .setting files are included in backtraces.
++
++=back
++
++=head2 Affecting Precompilation
++
++=over
++
++=item C<RAKUDO_PRECOMP_DIST> (F<src/core/CompUnit/PrecompilationRepository.pm>)
++
++=item C<RAKUDO_PRECOMP_LOADING> (F<src/core/CompUnit/PrecompilationRepository.pm>)
++
++=item C<RAKUDO_PRECOMP_WITH> (F<src/core/CompUnit/PrecompilationRepository.pm>)
++
++These are internal variables for passing serialized state to precompilation jobs in child processes.
++Please do not set them manually.
++
++=back
++
++=head2 Other
++
++=over
++
++=item C<RAKUDO_ERROR_COLOR> (I<Bool>; F<src/core/Exception.pm>)
+ 
+ Controls whether to emit ANSI codes for error highlighting. Defaults to true if unset, except on
+ Win32.
+ 
+-=item C<RAKUDO_MAX_THREADS> (src/core/ThreadPoolScheduler.pm)
++=item C<RAKUDO_MAX_THREADS> (I<UInt>; F<src/core/ThreadPoolScheduler.pm>)
+ 
+-Controls the maximum number of threads used by a thread pool.
++Override the default maximum number of threads used by a thread pool.
+ 
+-=item C<RAKUDO_NO_DEPRECATIONS> (src/core/Deprecations.pm)
++=item C<TMPDIR>, C<TEMP>, C<TMP> (I<Str>; F<src/core/IO/Spec/>)
+ 
+-If set, suppresses deprecation warnings.
++The C<IO::Spec::Unix.tmpdir> method will return C<$TMPDIR> if it points to a directory with full
++access permissions for the current user, with a fallback default of C<'/tmp'>.
+ 
+-=item C<RAKUDO_VERBOSE_STACKFRAME> (src/core/Backtrace.pm)
++C<IO::Spec::Cygwin> and C<IO::Spec::Win32> use more Win32-appropriate lists which also include the
++C<%TEMP%> and C<%TMP%> environment variables.
+ 
+-Controls stack frame verbosity.
++=item C<PATH>, C<Path> (I<Str>; F<src/core/IO/Spec/>)
+ 
+-=item C<RAKUDO_BACKTRACE_SETTING> (src/core/Backtrace.pm)
++The C<IO::Spec::Unix.path> method splits C<$PATH> as a shell would; i.e. as a colon-separated list.
++C<IO::Spec::Cygwin> inherits this from C<IO::Spec::Unix>.
+ 
+-Controls whether .setting files are included in backtraces.
++C<IO::Spec::Win32.path> will read the first defined of either C<%PATH%> or C<%Path%> as a
++semicolon-delimited list.
+ 
+ =back
+ 
+-- 
+2.6.4
+
diff --git a/dev-lang/rakudo/rakudo-2015.12.ebuild b/dev-lang/rakudo/rakudo-2015.12.ebuild
new file mode 100644
index 000000000000..29ce6a7007ff
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2015.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+RDEPEND="=dev-lang/nqp-${PV}*:=[moar?,java?]"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10"
+
+PATCHES=(${FILESDIR}/${PV})
+
+src_configure() {
+	local BACKENDS
+
+	# The order of this list determines which gets installed as "perl6"
+	use moar && BACKENDS+="moar,"
+	use java && BACKENDS+="jvm,"
+	#use javascript && BACKENDS+="js,"
+
+	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=$BACKENDS
+}
+
+src_test() {
+	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
+	default
+}
diff --git a/dev-libs/glib/glib-2.46.2-r1.ebuild b/dev-libs/glib/glib-2.46.2-r1.ebuild
index 31c7cd6d3928..92ad2ffdfbb0 100644
--- a/dev-libs/glib/glib-2.46.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r1.ebuild
@@ -238,6 +238,7 @@ multilib_src_test() {
 
 multilib_src_install() {
 	gnome2_src_install completiondir="$(get_bashcompdir)"
+	keepdir /usr/$(get_libdir)/gio/modules
 }
 
 multilib_src_install_all() {
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.100.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.100.0.ebuild
index 41e576f86c1b..3172ce9e0e4b 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.100.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Cairo/Cairo-1.106.0.ebuild b/dev-perl/Cairo/Cairo-1.106.0.ebuild
index 441570163211..027f7404b319 100644
--- a/dev-perl/Cairo/Cairo-1.106.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.106.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
index f61da829aa77..97a60ff29242 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="virtual/perl-version
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
index 8da7a13c1752..2faf9ff897e2 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBI/DBI-1.633.0.ebuild b/dev-perl/DBI/DBI-1.633.0.ebuild
deleted file mode 100644
index 571ad910f6d4..000000000000
--- a/dev-perl/DBI/DBI-1.633.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TIMB
-MODULE_VERSION=1.633
-inherit perl-module eutils
-
-DESCRIPTION="The Perl DBI Module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/PlRPC-0.200.0
-	>=virtual/perl-Sys-Syslog-0.170.0
-	virtual/perl-File-Spec
-	!<=dev-perl/SQL-Statement-1.330.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
-	test? (
-		>=virtual/perl-Test-Simple-0.900.0
-	)
-"
-
-SRC_TEST=do
-mydoc="ToDo"
-MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/DBI/DBI-1.634.0.ebuild b/dev-perl/DBI/DBI-1.634.0.ebuild
index 675393aa5a90..8216bc7cd618 100644
--- a/dev-perl/DBI/DBI-1.634.0.ebuild
+++ b/dev-perl/DBI/DBI-1.634.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="Database independent interface for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index 17dd749ab214..f5c7a0543a1a 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,3 +1,2 @@
 DIST DBI-1.628.tar.gz 586733 SHA256 46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52 SHA512 34bb50ba7c0364e064fd5a05ea5415e43e40d082ed299503beccf2cba7b2ddd8f1e79e96606f35f9da279175ac16531da96d3762a71e9e63570f6db7b683f3a1 WHIRLPOOL 95b72f418c5957dcc4051a889363ce020d6dfb4fcd30216d88c61e8ec66ed30822432343409418e342c62c67dabb91ab464338b14fe316ab20a38350b86f48a4
-DIST DBI-1.633.tar.gz 592307 SHA256 e2c1badcc9f672bf31630b36ecd230f7eb04dbf055e6daf7edeed0e9ebcf5ee7 SHA512 cd945a9b4f2d8c9ccf84d2f57772765b6f16652302271696a85ed8633fa40f6e70a908430ef6f189e4eba1454585327296c446909da26f093d6763ddb7d7cf08 WHIRLPOOL 31ecd1c178e79fc42520faff7d76e3d7809adde556c9fee9d2d99df11e19b782bc8e6ff622cc81792132a3ffa67c3a639f3ad6cdacf01c516212e353515e3daf
 DIST DBI-1.634.tar.gz 595020 SHA256 250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450 SHA512 42e2b94d5e4cdcd57aaa43519fa1464a4d7132ed09426bb8cb7092b0ee57edde168105a25d02dcdeb304c6bc13c1ad97bc27b54b5f6af05eeaba011d5dab3c44 WHIRLPOOL 53b4b8caa8161b6d6fd999b039c31018060e018bc1b0e24163017e1128db1b29e2c798f8d91e64d2e3653088fd502efb440f21ae0fd8754d3d29803ea405057d
diff --git a/dev-perl/DBIx-Class/DBIx-Class-0.82.50.ebuild b/dev-perl/DBIx-Class/DBIx-Class-0.82.50.ebuild
deleted file mode 100644
index 917a19816d81..000000000000
--- a/dev-perl/DBIx-Class/DBIx-Class-0.82.50.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FREW
-MODULE_VERSION=0.08205
-inherit perl-module
-
-DESCRIPTION="Extensible and flexible object <-> relational mapper"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix"
-IUSE="test admin admin_script deploy replicated"
-
-RDEPEND_MOOSE_BASIC="
-	>=dev-perl/Moose-0.980.0
-	>=dev-perl/MooseX-Types-0.210.0
-"
-RDEPEND_ADMIN_BASIC="
-	>=dev-perl/JSON-Any-1.220.0
-	>=dev-perl/MooseX-Types-JSON-0.20.0
-	>=dev-perl/MooseX-Types-Path-Class-0.50.0
-	>=dev-perl/namespace-autoclean-0.90.0
-"
-
-#	>=dev-perl/Class-DBI-Plugin-DeepAbstractSearch-0.08
-#	dev-perl/Class-Trigger
-#	>=dev-perl/DBIx-ContextualFetch-1.03
-#	>=dev-perl/Date-Simple-3.03
-#	dev-perl/DateTime-Format-MySQL
-#	dev-perl/DateTime-Format-Pg
-#	dev-perl/DateTime-Format-SQLite
-#	dev-perl/DateTime-Format-Strptime
-#	dev-perl/Devel-Cycle
-#	dev-perl/Time-Piece-MySQL
-
-RDEPEND="
-	admin? (
-		${RDEPEND_MOOSE_BASIC}
-		${RDEPEND_ADMIN_BASIC}
-	)
-	admin_script? (
-		${RDEPEND_MOOSE_BASIC}
-		${RDEPEND_ADMIN_BASIC}
-		>=dev-perl/Getopt-Long-Descriptive-0.81.0
-		>=dev-perl/Text-CSV-1.160.0
-	)
-	deploy? (
-		>=dev-perl/SQL-Translator-0.110.60
-	)
-	replicated? (
-		${RDEPEND_MOOSE_BASIC}
-		>=dev-perl/Hash-Merge-0.120.0
-	)
-	>=dev-perl/DBD-SQLite-1.290.0
-	>=dev-perl/Carp-Clan-6.00
-	>=dev-perl/Class-Accessor-Grouped-0.100.90
-	>=dev-perl/Class-C3-Componentised-1.0.900
-	>=dev-perl/Class-Inspector-1.240.0
-	>=dev-perl/Config-Any-0.200.0
-	dev-perl/Data-Compare
-	>=dev-perl/Data-Page-2.10.0
-	>=dev-perl/DBI-1.609.0
-	>=dev-perl/Devel-GlobalDestruction-0.90.0
-	>=virtual/perl-File-Path-2.80.0
-	dev-perl/Hash-Merge
-	>=dev-perl/MRO-Compat-0.120.0
-	>=dev-perl/Math-Base36-0.70.0
-	>=virtual/perl-Math-BigInt-1.80
-	>=dev-perl/Module-Find-0.70.0
-	>=dev-perl/Moo-0.1.6
-	>=dev-perl/Path-Class-0.180.0
-	>=dev-perl/SQL-Abstract-1.730.0
-	>=dev-perl/Sub-Name-0.40.0
-	>=dev-perl/Data-Dumper-Concise-2.20.0
-	>=dev-perl/Scope-Guard-0.30.0
-	dev-perl/Context-Preserve
-	>=dev-perl/Try-Tiny-0.70.0
-	>=dev-perl/namespace-clean-0.240.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-File-Temp-0.22
-		>=dev-perl/Package-Stash-0.280.0
-		>=dev-perl/Test-Exception-0.31
-		>=dev-perl/Test-Warn-0.21
-		>=virtual/perl-Test-Simple-0.94
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
diff --git a/dev-perl/DBIx-Class/Manifest b/dev-perl/DBIx-Class/Manifest
index a066d7214e6a..c85af5b2321f 100644
--- a/dev-perl/DBIx-Class/Manifest
+++ b/dev-perl/DBIx-Class/Manifest
@@ -1,2 +1 @@
-DIST DBIx-Class-0.08205.tar.gz 735395 SHA256 d448d5ba623e8da8a5d109a7dec907c1b5fcc2088a527e3b27c913c7b7cb3e9a SHA512 317caa585d84d7196f4c4fa437c8abf530d4ec3c4ed61d11409a6d882088c05bc0413eb70d33b2eac9998de365de737567c4547490e62f39c2f9d36dd626e42a WHIRLPOOL cfae377fed04457a9de922c3bbcf41cb98e2d93e2033a75494bf968357e5e93882237ed8d95679359a60620660d7a31cbcf5a59b4c150815b106f3d17fc5fe9b
 DIST DBIx-Class-0.08270.tar.gz 808377 SHA256 6deccac1a195429324c811a31f4b24515ddf7ee2893d1c299852cac6e782e3c5 SHA512 bd9a52e933e57266a81ea25330672af254ed669be47acf8164426a9a803b6a4c81ab0a6a663f5b13ade0ff8c749bf5c68fa114b0c89b236e7a8d53beeff0bc10 WHIRLPOOL 07047213399215841e4c49cd2f9053d3e1a07b915b959355495d6a2ecaf9aa44f48a6540bc112306c7a21096f99c2afb617517e2405334991533b4c10385cbc3
diff --git a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
index ba8fab084c7c..f54983350f1e 100644
--- a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
+++ b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.100.0.ebuild b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.100.0.ebuild
deleted file mode 100644
index 0e61a3650055..000000000000
--- a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.100.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR="NEELY"
-MODULE_VERSION="0.10"
-
-inherit perl-module
-
-DESCRIPTION="Light weight module for validating domains"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa"
-IUSE="test"
-
-RDEPEND=">=dev-perl/Net-Domain-TLD-1.690.0"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild
index 444bff1033aa..d98f55d4884d 100644
--- a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild
+++ b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Domain and host name validation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="amd64 ~hppa"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Validate-Domain/Manifest b/dev-perl/Data-Validate-Domain/Manifest
index ee9ab916736b..2f0eb546fed6 100644
--- a/dev-perl/Data-Validate-Domain/Manifest
+++ b/dev-perl/Data-Validate-Domain/Manifest
@@ -1,2 +1 @@
-DIST Data-Validate-Domain-0.10.tar.gz 7988 SHA256 be17fbc945c8ab3faac8870bed99704c023919863e583c56b43e9df05ef7a39a SHA512 d6ba6f63ef09cdb92f65d96451109ee0104b3ced164800cc07939b368d53d37043753e659d46ca8586bf8614c2c1908dc5ca36a5e7ffaae94e4a822a8fd44653 WHIRLPOOL d799bef9734870f22724bebd59a2f34360d1a1b145f4be2301bbb89a8fc8350771cd4175dc4c6e0e5db83bbcc2bf262b7510848f3d433b57a3e207556804ba1c
 DIST Data-Validate-Domain-0.11.tar.gz 26678 SHA256 f2ae0830f423a46080b185ffc2428c9a37278167a8d19bfdeec26d977b43822c SHA512 871ad620a9c6021bdc25895ca78c12bf6b9f515b3e139864f0c52c9067d65c9f5dad95f21d30d59a57b1a808b373a132cff7f347832705af081d4a435d0872e1 WHIRLPOOL bb5ad9b77e08b62423d0624ccbecbbc72a35ed1172ad92fd052c967599d8dbd8f7c76b819d35d063c2138240cd6520eea51185b0a5729784d6b9ab933f631e58
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild
index dce7437fdda3..36306d3d0432 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Debug-Client/Debug-Client-0.200.0-r1.ebuild b/dev-perl/Debug-Client/Debug-Client-0.200.0-r1.ebuild
deleted file mode 100644
index be11c299280e..000000000000
--- a/dev-perl/Debug-Client/Debug-Client-0.200.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BOWTIE
-MODULE_VERSION=0.20
-inherit perl-module
-
-DESCRIPTION="Client side code for perl debugger"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		>=dev-perl/Test-Class-0.360.0
-		dev-perl/File-HomeDir
-		>=dev-perl/PadWalker-1.920.0
-		>=dev-perl/Test-Deep-0.108.0
-		>=dev-perl/Term-ReadLine-Perl-1.30.300
-	)"
-
-SRC_TEST=do
diff --git a/dev-perl/Debug-Client/Manifest b/dev-perl/Debug-Client/Manifest
index 72de2670878f..03111e1f0a22 100644
--- a/dev-perl/Debug-Client/Manifest
+++ b/dev-perl/Debug-Client/Manifest
@@ -1,2 +1 @@
-DIST Debug-Client-0.20.tar.gz 38741 SHA256 a1643b3c2e9fe0a39eae975c4ca81cb0cd44dde5dc0aec07600b727ebf190913 SHA512 53193a1575fcedc9ebc14a99e8b7d1ae12542f9085b7f303d6ef72f9f473cb4ff297f25deb3f75aa13e8963e203acbb2717c059d1ac61972f7d53f91db0f00dd WHIRLPOOL 35358b7fd2df0a001b4433882ab0728144883f24a2117b0a4d66e4374a1457e296e64852dc68b5b9e3a0f54b7a073f4d9368ef1e209e03c8f3e92a58c8d39452
 DIST Debug-Client-0.29.tar.gz 41615 SHA256 51f4ea6c6991221024a08b6106d4af1455452fae3b809b0bf0a208fbddb30efa SHA512 32c5adcc11cf32d729fd027e6cc5c2129d2375391cee4321b29a508029da3054fbc84fae4e84674bf0eac2740f431c9d41d3059e48e4e4963be4bdaa29ebd17e WHIRLPOOL 8af7b98c83c136bcfb9c1759c456a7ff0e6d45344f032a5ed634f91f2d288370943a7498d262c115fba00cd1ba745aec77fd668bcf905a9ac044711d032161b9
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.180.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.210.0.ebuild
similarity index 80%
rename from dev-perl/Devel-Cover/Devel-Cover-1.180.0.ebuild
rename to dev-perl/Devel-Cover/Devel-Cover-1.210.0.ebuild
index 76f53ee87d37..ef535c8fd297 100644
--- a/dev-perl/Devel-Cover/Devel-Cover-1.180.0.ebuild
+++ b/dev-perl/Devel-Cover/Devel-Cover-1.210.0.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-MODULE_AUTHOR=PJCJ
-MODULE_VERSION=1.18
+EAPI=6
+
+DIST_AUTHOR=PJCJ
+DIST_VERSION=1.21
 inherit perl-module
 
 DESCRIPTION='Code coverage metrics for Perl'
@@ -20,7 +21,5 @@ DEPEND="
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-Test-Simple
-		dev-perl/Test-Warn
 	)
 "
-SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-Cover/Manifest b/dev-perl/Devel-Cover/Manifest
index d8c9a6e62aed..3615ebf0c676 100644
--- a/dev-perl/Devel-Cover/Manifest
+++ b/dev-perl/Devel-Cover/Manifest
@@ -1,2 +1,2 @@
-DIST Devel-Cover-1.18.tar.gz 207365 SHA256 95f73ffcabfe6948fd926305958a1116501c0461eeef0aa6e1c8979c79efcb12 SHA512 1d11ccd48fd93a8a4c0096f95fbed10de603ba8b2ed78fa90528f88588825a4d897c916376687e9bd1eca95642a1f11c7fdd17b7c116116a0a67a4422139bf21 WHIRLPOOL ff755f8b35dcff1aa1b98eff5a95b62eaf50857c9c273d8d0d17e2898b4ff2a6b2e82169427301736f0619ce372080aff25609c5df0c363df5ec931d509de037
 DIST Devel-Cover-1.20.tar.gz 223004 SHA256 0377cc0362968cf25bd1140e4927b48916ddf3de53c76856dcfe1b0e1a3a89c1 SHA512 2c51eb033c9e37dfbe2d0cbf664b5044a99f5cac4c3e87aeada7829a5d130ec0efc390b5fb2e6795c39d01bfb4d18c4249bf81aeee639841f51b9f306b918faa WHIRLPOOL aa02321a2b66c42ed924fab37ac90e197683cdd5412d9ae70e906edf4cd0f206a8299d2e17b2517d83f2128a435e1a9749d90747e0cca967e29f90aa8aa9c347
+DIST Devel-Cover-1.21.tar.gz 230432 SHA256 6fcd49df2d1212be2ebcd0bd39d18b0241a3d1e2f551137a7a82b4041e618cf1 SHA512 80c508161b53a42f7b971bf6a5221fdb1588bc6811afe4ed21f3343d7cab204c93942bad31c987b2593f5dfb9e40062c7a8f4c06f62e13e6f3a512046831e457 WHIRLPOOL 59bc6b2871769fc6db251f9139c8c80840b0949012fd97c909507ac113ece28b7fd2208cca657d299cc3160b1bb46d9530e281a10cafa02ba61af11d9a4ad882
diff --git a/dev-perl/Devel-Declare/Devel-Declare-0.6.14.ebuild b/dev-perl/Devel-Declare/Devel-Declare-0.6.14.ebuild
deleted file mode 100644
index 4be1242caf70..000000000000
--- a/dev-perl/Devel-Declare/Devel-Declare-0.6.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.006014
-inherit perl-module
-
-DESCRIPTION="Adding keywords to perl, in perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Sub-Name
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/B-Hooks-OP-Check-0.190.0
-	dev-perl/B-Hooks-EndOfScope
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-Depends-0.302
-	test? (
-		>=virtual/perl-Test-Simple-0.88
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Devel-Declare/Manifest b/dev-perl/Devel-Declare/Manifest
index c184b2abd417..b6621e55dedc 100644
--- a/dev-perl/Devel-Declare/Manifest
+++ b/dev-perl/Devel-Declare/Manifest
@@ -1,2 +1 @@
-DIST Devel-Declare-0.006014.tar.gz 43725 SHA256 6b46efa05ceb5c61e85e6cd053b523678f0c5bbba3ddca02304963ed0eec0429 SHA512 2b63ebb48e6a3b1c8d722a0da64aa236512b8d68f1ad00c6580e97e3f2d7c3d4468621e37865fbc12e95b2a4302bc266bd5cd94b1207f761894803f336cbcd5b WHIRLPOOL d58d9a9e7a29e165838c0d5d337b5b7d752f588c0c3dea44541968d9994abb294af642eb19ba49cb4435dc073d3144113abff741bb9d4cccccb9ff2340183f78
 DIST Devel-Declare-0.006018.tar.gz 44155 SHA256 bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a SHA512 0d85d8f00c566aac63a86a4b8990aad1b1267bfd7cfe7304c106e26d066d75c74b54a7ca6998dcd2fd6a05cf6e9388355baa2a24f520156e1b2a132def823bf1 WHIRLPOOL ad28e25f095afcf3af2a8a30f3f4e1ad9711d47208af1b041a0e6cb89a6a3dcec1905031cbd7ec8fd9f60f6eec1a8e3cdb271b875977e1bcffd1bf8b4b005858
diff --git a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0-r1.ebuild b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0-r1.ebuild
new file mode 100644
index 000000000000..666847e68751
--- /dev/null
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION='Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Sub-Exporter-Progressive-0.1.11
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-CBuilder-0.270.0
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Devel-GlobalDestruction/Manifest b/dev-perl/Devel-GlobalDestruction/Manifest
index 4effe78a785e..f4a0668a7732 100644
--- a/dev-perl/Devel-GlobalDestruction/Manifest
+++ b/dev-perl/Devel-GlobalDestruction/Manifest
@@ -1 +1,2 @@
 DIST Devel-GlobalDestruction-0.12.tar.gz 7803 SHA256 98a5b7668fc710e4c7ebe8860508fbebeea830eab6243d21ed8d7ac293278a70 SHA512 f1e259003aad8b654a7d1922cae7c3603527a6d674222069c1b8e9c7bd831549d8477acf7cc61d550991fd479e1cd5e092ea2e8e6f5b42066f5033c143ee7aa4 WHIRLPOOL 40a0d86d261235523f41e0eb84cc0171c4da97a49d803c995ce96a98f86fcb68efc544f4ba7db6b48f25de31c99eb7a8bf26b6a84825060709c389f52dd77d01
+DIST Devel-GlobalDestruction-0.13.tar.gz 8460 SHA256 b29824dc0d322e56da325f05185367eb443694716010b36693dd52ffbe8ec462 SHA512 dd63a8e6a512c732cabfcd887ee37eea2b7a083f31e1a4b7410dff41cbf88e5ed15e2d6e4f4d98ceb71603afd02b8155ef98c340753a7dee8b99c86d2dd991fd WHIRLPOOL 55c6946e301be6493f6e51db53901f4a60f612cad15be260b17b7e79ba3f74699dbf132e18888637285e41af36df1b42242d19f92c993c1450186bc162216d00
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-5.60.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-5.60.0.ebuild
deleted file mode 100644
index b10ca8d31c18..000000000000
--- a/dev-perl/Devel-NYTProf/Devel-NYTProf-5.60.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TIMB
-MODULE_VERSION=5.06
-inherit perl-module
-
-DESCRIPTION="Powerful feature-rich perl source code profiler"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Getopt-Long
-	dev-perl/JSON-Any
-	sys-libs/zlib
-"
-#	virtual/perl-XSLoader
-DEPEND="${RDEPEND}
-	test? (
-		virtual/perl-Scalar-List-Utils
-		>=virtual/perl-Test-Simple-0.84
-		dev-perl/Test-Differences
-	)
-"
-SRC_TEST="do"
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.10.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.10.0.ebuild
deleted file mode 100644
index 9e4dec14075d..000000000000
--- a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TIMB
-MODULE_VERSION=6.01
-inherit perl-module
-
-DESCRIPTION="Powerful feature-rich perl source code profiler"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/File-Which-1.90.0
-	virtual/perl-Getopt-Long
-	dev-perl/JSON-Any
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-XSLoader
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Scalar-List-Utils
-		>=virtual/perl-Test-Simple-0.840.0
-		>=dev-perl/Test-Differences-0.60.0
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index cd9643530e17..6c4bd262d17e 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,3 +1 @@
-DIST Devel-NYTProf-5.06.tar.gz 427853 SHA256 c6733e8676773b1e15e98725e5f817e4354ae2e2c8472fdfc2a7d327380b35e0 SHA512 add2c4272243f2d729370354c43715217b1bba3c00b9eeeef006adc2f9ec2e88c0b9568a0b5c5296b5118d15957918b1e2a9ce4943fbc197089b80b208abeceb WHIRLPOOL 3856887532fa0f8d1e1500847cc0b3a928e011d94fad281cf831c6abc152034dc5564e9dda01d1433c1162aaad06f46aee0318211fd626e4ee9de5ab92d24f5a
-DIST Devel-NYTProf-6.01.tar.gz 432670 SHA256 d7decf4131ab8fe58fcb8ef6c8f8140220bbde091ae16fdc8185324ee66157e9 SHA512 a3978dbf18b1768c0b8fded2d684c3ae511df85ebe3507cc7bb4d34a17afb95a0128cbb31ed33b181258257d409af44f5a0773eebb35a7a71f08cda66377b509 WHIRLPOOL d159373da98d31d6b2b1caa5927a14c5c18baa8c1c6303d300470eaae8dbe449c69eb38f847891fa44430edba97e3af91177318a8795fad9aa0ff7fdc5b6eb82
 DIST Devel-NYTProf-6.02.tar.gz 437762 SHA256 788bb97d9b983cab15e947ef1932d547c50635a6f48b08cb275391179691f08f SHA512 f2e3a65d7351e982c6cb00a2cbd446d1aebd3438e89452b910169072ded0a21aac8a27a4fa99efe5f941f22e62b20881b40a17cbd2bb1cada6e5418d39b133bc WHIRLPOOL 3cb6b5e066fe1bb32437dd0ad4978b979903c5899e1071e720432dfb808c6e9787a4fc5f3225ddbb96be9f8a9a87b9d45678e319a9b0689d2e27c883fb9c58c8
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild
deleted file mode 100644
index 6aa1e726af30..000000000000
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ILMARI
-MODULE_VERSION=0.002
-inherit perl-module
-
-DESCRIPTION="Introspect overloaded operators"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-# Scalar::Util -> Scalar-List-Utils
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	dev-perl/MRO-Compat
-	>=dev-perl/Package-Stash-0.140.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Sub-Identify
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		virtual/perl-parent
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-OverloadInfo/Manifest b/dev-perl/Devel-OverloadInfo/Manifest
index 5dbab601f4f5..1ef92dc60420 100644
--- a/dev-perl/Devel-OverloadInfo/Manifest
+++ b/dev-perl/Devel-OverloadInfo/Manifest
@@ -1,2 +1 @@
-DIST Devel-OverloadInfo-0.002.tar.gz 10966 SHA256 de6383f6aff1972897993eccd7fcb73a19ebb028c148fc35b8f87a883595ff91 SHA512 fb293f0466b40135c92b8579631a3fe4a7d4cbf1c3720d14972a24f2144218a00594d5496c0231a77f8ab3a465194d3c6beea02785fbd2629ce0f193060914a9 WHIRLPOOL 67b2decec869c76f6d9844ad11199414993aec3c73949f05e42d38bc5bcbcf30dcfe20df0e2476849181c2d6161848f13feba1220300c172e64471a079fcb836
 DIST Devel-OverloadInfo-0.004.tar.gz 12013 SHA256 83e88450064b0b0bbfd520cc9d7997fc7bed14ae257894eeadda28dc3e94937d SHA512 a8770f3319c8224d348fd28b1a057333e87d73b914c892d3c3581673db6fef8b5728a02a485eefc90edbc05899150cd8e172f464f0a4a29e8161815f6de8dcb1 WHIRLPOOL 29466593b99cf590ae10585cf5e198a612a9ffebb60c51d641237241c0bdd9d3e672f6a21edeb36d80581e82b24315bc0df79bf17b71fa40c63137e7ae0a2548
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.400.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.400.0.ebuild
new file mode 100644
index 000000000000..994d6b56521a
--- /dev/null
+++ b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.400.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=1.40
+inherit perl-module
+
+DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/File-pushd-1.0.0
+	virtual/perl-IO
+	virtual/perl-MIME-Base64
+	dev-perl/Module-Pluggable
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Devel-PatchPerl/Manifest b/dev-perl/Devel-PatchPerl/Manifest
index 886b9fbb2de3..713d11bf77cb 100644
--- a/dev-perl/Devel-PatchPerl/Manifest
+++ b/dev-perl/Devel-PatchPerl/Manifest
@@ -1 +1,2 @@
 DIST Devel-PatchPerl-1.38.tar.gz 109406 SHA256 f3e55d9211f984c5956e7decd85e5d59b4d1613d3543bb4007be6f3d89ae2725 SHA512 4762d956107d7d86f1208ec706df5399493a388f8af24c741c20ef1aaa8b9202e1f6528725c2ee7e33e192c9c1b8d218774fcc5b4428d48683d1c56679fd134a WHIRLPOOL e9415fffde1afe6fc610d8c253d9724444ef88f2a05d719721ed148e24ca72298eed62a3096583906a80c5cba4ced12a1fafccd5f214dcd11a96f3781733cfa2
+DIST Devel-PatchPerl-1.40.tar.gz 112285 SHA256 d4eb2ded7b96c00803fd45f2899d3dff62b5bb05880a05d9507f3df3e055d982 SHA512 2c1c9ea283a06ac1750ccf54acb824125bc259b7598ac2e3571569c6ff70db8b8cb01c1f6b6fc1ad451d10104954d7472c5e29e963dce52c289a6f869b0271f5 WHIRLPOOL cbf6aedcd7651f6c8c8d239876b2a8c5a7c8b5b840966db26dc8d220d188ac65337aced08630f53f4a7a4ee9c9082cdd6de6b18d3a25a8587fcd42c270ab018b
diff --git a/dev-perl/Devel-REPL/Devel-REPL-1.3.14-r1.ebuild b/dev-perl/Devel-REPL/Devel-REPL-1.3.14-r1.ebuild
deleted file mode 100644
index 378b01179f77..000000000000
--- a/dev-perl/Devel-REPL/Devel-REPL-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.003014
-inherit perl-module
-
-DESCRIPTION="A modern perl interactive shell"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Moose-0.740.0
-	>=dev-perl/MooseX-Object-Pluggable-0.0.9
-	>=dev-perl/MooseX-Getopt-0.180.0
-	dev-perl/namespace-autoclean
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	virtual/perl-Term-ANSIColor
-
-	dev-perl/App-Nopaste
-	dev-perl/B-Keywords
-	dev-perl/Data-Dump-Streamer
-	dev-perl/Data-Dumper-Concise
-	dev-perl/File-Next
-	dev-perl/Lexical-Persistence
-	dev-perl/Module-Refresh
-	dev-perl/PPI
-	dev-perl/Sys-SigAction
-"
-# B::Concise? => perl
-# Devel::Peek => perl
-# Term::ReadLine => perl
-
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Devel-REPL/Manifest b/dev-perl/Devel-REPL/Manifest
index ba3ec20a75fe..d8953525b2ee 100644
--- a/dev-perl/Devel-REPL/Manifest
+++ b/dev-perl/Devel-REPL/Manifest
@@ -1,2 +1 @@
-DIST Devel-REPL-1.003014.tar.gz 54177 SHA256 3a7337e54dc0ae87120fbf89b0e032c0c5c6f74599fe07127b575dafd41586f2 SHA512 5ee90a29c42c929d7301d5f4fb854148366feeab62c7c0df5d7ff9a75c089eef16b1b8651bffae0edc72891f0c098e9dab285c7a6bdf611aaee99d39a0a3dd59 WHIRLPOOL 03fbd531999f88880e705dc51af0e06a76552756933d5977ed228dc2e0d74a65a9cca2e9a1ecc6ecf9fda230bd6cbde7f173075d6e974e476b9155884bed84f4
 DIST Devel-REPL-1.003027.tar.gz 59295 SHA256 c332ae2facae81618d71854d34f32d95c37dfc5aa9a37ae6f04c3d33833889ae SHA512 6541b5b59b2fbadc1a5d6994ab653feae1f142531612c1efc36ced15bac2d9a356401f6737b8b3bb43e20af066382e134176ad28ec359e8de2ed2cb955c2d2aa WHIRLPOOL f44f708b0563018caa7af6f342610afeae35bfe2f8c04a6ba695424ec484b68533242952bb54bca2dce6748cf3d0f0fe2f924bd6a9b9a1f81e9b1c9eb15ff72b
diff --git a/dev-perl/Devel-Size/Devel-Size-0.790.0-r1.ebuild b/dev-perl/Devel-Size/Devel-Size-0.790.0-r1.ebuild
deleted file mode 100644
index 9b9791ae571a..000000000000
--- a/dev-perl/Devel-Size/Devel-Size-0.790.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=NWCLARK
-MODULE_VERSION=0.79
-inherit perl-module
-
-DESCRIPTION="Perl extension for finding the memory usage of Perl variables"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Devel-Size/Manifest b/dev-perl/Devel-Size/Manifest
index 624c6f724eb4..a3e824763019 100644
--- a/dev-perl/Devel-Size/Manifest
+++ b/dev-perl/Devel-Size/Manifest
@@ -1,2 +1 @@
-DIST Devel-Size-0.79.tar.gz 69068 SHA256 1370f2a054e0bcbd93099c8b31a1e2f7ac8801e1ffea5c401404c16b9cbb1ae8 SHA512 70e49254c4c86c4c05c5915ce2cbbf360f298ca0bb1e26f23fd5b73f25e4f98fa7bcd15185afe1d1bb8ed8a32b59c015efdbb1ab0c23ef2eb7412eb6d040acdd WHIRLPOOL aef7a76c73517435ca2ccb35671b6f82b758efc9cd3880b14924df93e8955fa2bc90f62625c9c72560bb7ada9a135671affbe76a835255556686b4c2033d15c8
 DIST Devel-Size-0.80.tar.gz 72856 SHA256 ca3a089cb263ab6b9751df777cf6d3df3ba470d471d300a8076e4be6e288d057 SHA512 ab146c631a56dace05158395ecaf56e785655a4dbe1893b6c52bc89768ed56b9f5df81b2c2acba4259add083f19349a7bff0b224c3a4e586469091501833bc02 WHIRLPOOL a7e75429fc491909bf28f2752262b7bdad447d37a00e7cffb9b233a1e5fc1de12e2478042c7e8e074d40e397000abeb11acdb94bdab1ecf387d907287e287687
diff --git a/dev-perl/Email-Abstract/Email-Abstract-3.7.0.ebuild b/dev-perl/Email-Abstract/Email-Abstract-3.7.0.ebuild
index e1ca6e8b9263..77da54cac3d0 100644
--- a/dev-perl/Email-Abstract/Email-Abstract-3.7.0.ebuild
+++ b/dev-perl/Email-Abstract/Email-Abstract-3.7.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="unified interface to mail representations"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-perl/MRO-Compat
diff --git a/dev-perl/Email-Address/Email-Address-1.908.0.ebuild b/dev-perl/Email-Address/Email-Address-1.908.0.ebuild
new file mode 100644
index 000000000000..5afb550de344
--- /dev/null
+++ b/dev-perl/Email-Address/Email-Address-1.908.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.908
+inherit perl-module
+
+DESCRIPTION="RFC 2822 Address Parsing and Creation"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Encode
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Pod-1.140.0
+		>=dev-perl/Test-Pod-Coverage-1.80.0
+	)
+"
diff --git a/dev-perl/Email-Address/Manifest b/dev-perl/Email-Address/Manifest
index 5258781b8b0c..039192f9e749 100644
--- a/dev-perl/Email-Address/Manifest
+++ b/dev-perl/Email-Address/Manifest
@@ -1,2 +1,3 @@
 DIST Email-Address-1.905.tar.gz 39663 SHA256 737f15e4e3ac09186d7053a1b89619d0b714a284f232e207677b186d9fcc92b2 SHA512 236b3740f11f42de9ad4be8e31562bf96408b745bbbe1a2b8a11093fbb05b23b95c10ddc2c0bfeb057b5d03bbd265f1480323a2ee732ca6f6b9660ef16853986 WHIRLPOOL 13398b8039aed869b8f8aeef6557df45bcd297a93c6f091f72e61afbd107c1bf36e42aa8180078cdaf8eb3106f9de3a3c03039c4b70000b6d9f4d6059dfb5848
 DIST Email-Address-1.907.tar.gz 41262 SHA256 1d8653e356a7d390ca23358f14e30d1f48ea3fcab1b52d584b5bfe9b48c824aa SHA512 c62c4cd96cd73a914166245af237e5a11e44a6e30f4620ee6ce8a1f04197c35c34706bbd3cef0a87b1ce043f43623154949f3d089c3f582a1b82ddc45b4f4dd2 WHIRLPOOL 56523f5a99e28cdc006c72a736cb9f76d283920267576511e67c59479fb026b6a9a6bc6a6de05e42e219ecf243cfc708530b3604881a6dd8ab885944f9cc2e64
+DIST Email-Address-1.908.tar.gz 41925 SHA256 e5f860bdfe6d768324bc9e402d563667e4171dd98f1a87d785e9087f7793d444 SHA512 041744a43648ca53f3b78b387b8f170c000a2d67cf22f2740609a80feace70bc5d29389f22d96a7b7700efdd6a39c90eae494f17c7dc9e909f421df5ecb473ed WHIRLPOOL 1092b5b76b291f9f8677688ba8f8d773c230524917b1886b44ace6b838fae2bdb92f7bf84b2869e668a38e4cefdcb0612a64419f5440fc702b0cf8bb603c8ccf
diff --git a/dev-perl/Email-FolderType/Email-FolderType-0.813.0.ebuild b/dev-perl/Email-FolderType/Email-FolderType-0.813.0.ebuild
deleted file mode 100644
index a5edecaa75ef..000000000000
--- a/dev-perl/Email-FolderType/Email-FolderType-0.813.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.813
-inherit perl-module
-
-DESCRIPTION="Determine the type of a mail folder"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Module-Pluggable"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Email-FolderType/Manifest b/dev-perl/Email-FolderType/Manifest
index dbc2cb8cb44c..02b64a7a3d86 100644
--- a/dev-perl/Email-FolderType/Manifest
+++ b/dev-perl/Email-FolderType/Manifest
@@ -1,2 +1 @@
-DIST Email-FolderType-0.813.tar.gz 19419 SHA256 0ed8c9eee0c858f32653cd66a95818ef99d9a4b25416c317ff6dffa7706ec108 SHA512 c9259b9ffc8d7efd88f8c18fc7f4116e7fffb8fcb514f457904a429b1f2b4a40835762a7ccbb2b8559f6035f743787a29e0b7e294f84e3cb2fdf4a2b3bd56eda WHIRLPOOL b53b486aafc43e673c2e478fd838084e1e4dc3d3ffcc5f3937892317dadc35eae67846133202961b1729affd0e4992219b41128ae0665bb59bd62a1b0842c68a
 DIST Email-FolderType-0.814.tar.gz 22454 SHA256 a0648cfa85689f76e239f47314457f2901c22bfe504f5481e7dd833a275fe3ef SHA512 3cc7e408af57b852f8d037035da929fb3e07b76bbb53f0aa435397e57006483102433ca4a6ddc7108a4efef948d4569220f1b5aaced304df2ea732e9c3ef6192 WHIRLPOOL aee0f28388432a9839494e62756d8cde5ec9b9870d7237ad823597256c77a17fc598e75ec8ed35effcf92642049409bcf20f16472852f3f3b439217b193c04d3
diff --git a/dev-perl/Email-MIME/Email-MIME-1.936.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.936.0.ebuild
new file mode 100644
index 000000000000..56ac4cbe8c85
--- /dev/null
+++ b/dev-perl/Email-MIME/Email-MIME-1.936.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.936
+inherit perl-module
+
+DESCRIPTION="Easy MIME message parsing"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Email-Address
+	>=dev-perl/Email-MIME-ContentType-1.16.0
+	>=dev-perl/Email-MIME-Encodings-1.314.0
+	dev-perl/Email-MessageID
+	>=dev-perl/Email-Simple-2.206.0
+	>=virtual/perl-Encode-1.980.100
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-Types-1.130.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
diff --git a/dev-perl/Email-MIME/Manifest b/dev-perl/Email-MIME/Manifest
index 8500d0eaf6c4..e94e8bf08b37 100644
--- a/dev-perl/Email-MIME/Manifest
+++ b/dev-perl/Email-MIME/Manifest
@@ -1,2 +1,3 @@
 DIST Email-MIME-1.926.tar.gz 111817 SHA256 458b8dd539827a671352f4e9c759322e74e630b8e934fc942dbc06525a7d01a2 SHA512 79eb9e98dcfda1fdd023ab7c42fe151cb9fc482844648be9bd9cbb73cc9583f1a78f8aa5e056e3c45a63fbe87db2aaafd7d460481697e22e787286f929807db3 WHIRLPOOL e2c3c876df7a9852794f3c99ef346b1e0bcf8b2ae158ad05fc203576d9154414f0428e59241b12987cfe38098fd699001f3dfdf634e28b181041134ad2182470
 DIST Email-MIME-1.929.tar.gz 115105 SHA256 b0c9267bd9266e40671c2080782f7303cb17b4e93bd066b8677137f21a6dc7e9 SHA512 13a2591de92720dd3f8f798e442cf65c391d38e2a6d1e72d87c9301e8e3b2aa8fc1c8e3cfbcb829f14844bde59575a03ef7eb535741624e4dc8f3575c4089697 WHIRLPOOL bd89adfe87ea78604c860730ef76f6f69c2e97512075445264f05297d08ae977ff76c48ee6d89c05760d3811126aebe89b985dcd1246e6d2065770f774f4f709
+DIST Email-MIME-1.936.tar.gz 117468 SHA256 4c0934284da84b8e9ed48ff1060c9719273fac18e776f4c8e888a47c863ee661 SHA512 3f7fa49a14cb4351a5967600f0ea6b491558ba0ee71799b58ff1a39579ca27776f2e22092d09cacfa5c1f1281033f216ba961807c2b72272e0c8dea5b0db024a WHIRLPOOL b42bd7f03daaeeb211fe84f2a154ad6186724b1e8b0b4ec92c8ac07f94900d84096b771127022a49e4cbd744930db763edc69146eb7a696c2f5904e3f9dfa2b9
diff --git a/dev-perl/Email-MessageID/Email-MessageID-1.406.0.ebuild b/dev-perl/Email-MessageID/Email-MessageID-1.406.0.ebuild
new file mode 100644
index 000000000000..f2aff818cf4c
--- /dev/null
+++ b/dev-perl/Email-MessageID/Email-MessageID-1.406.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.406
+inherit perl-module
+
+DESCRIPTION="Generate world unique message-ids"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+		virtual/perl-File-Spec
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
diff --git a/dev-perl/Email-MessageID/Manifest b/dev-perl/Email-MessageID/Manifest
index a07768e8693b..97f06eb29e65 100644
--- a/dev-perl/Email-MessageID/Manifest
+++ b/dev-perl/Email-MessageID/Manifest
@@ -1,2 +1,3 @@
 DIST Email-MessageID-1.402.tar.gz 10794 SHA256 215abe9f8594279eb49a14318adb403e5a55d9979dca34936d2225f87cebebff SHA512 2f89ae6f7c219118b432659bab7b53b64a135dadec7e9aef1a1dacc4cab479e1a9ad2fed01234ba4c7bd846b41cb3463d8bf1c738b7dba9b21954b6b7fb7d93b WHIRLPOOL 6318686a520f4a92ac4c5221aa9a93bc2825fcf887ac6cbb5221ae1a0e72df124abf4287b286832e5d686c4c2be0732fd7222dec590390a0c592d7126700e6d8
 DIST Email-MessageID-1.405.tar.gz 14841 SHA256 03e7ade51b3ccbadf642bdea0cfb6af007fc871cb5f1319c4ba907f195354124 SHA512 ea91d8e9ca9c54434b58d5e8d27ff99b746be72b6a3115ff43900b2399ea51bc1f50639b1b5e475ec97d2105a1cc64153a14fe0652bdbca7bdd5a1cb237d82a6 WHIRLPOOL d45fd55a0402b6cd4bdce7bbab6a8aee55b48f1ebcd330aa65d3ca1e2380e81a6f3713173e9ac6327c1691f6c96ad49b3bf0ae7a770255e3a113d3b76ba804b4
+DIST Email-MessageID-1.406.tar.gz 16247 SHA256 ec425ddbf395e0e1ac7c6f95b4933c55c57ac9f1e7514003c7c904ec6cd342b8 SHA512 c36861267a127372076391e5e6458ee19bbdc8d09c3b1ce3131d0cad1a82a6f9b2bc5a29df8bafa2450ea0e5c06993abf98928f2246e694d05875e40b7e36109 WHIRLPOOL ae8f142241ab1d04113a14baa45d9eae8c1012cec3dcae2ef805e5eb94d76814bc8acbbe731922537ae2a1b38efe7cb118c0332e27e7828a2235576b9a5b0422
diff --git a/dev-perl/Email-Reply/Email-Reply-1.204.0.ebuild b/dev-perl/Email-Reply/Email-Reply-1.204.0.ebuild
new file mode 100644
index 000000000000..973e6a5f1a38
--- /dev/null
+++ b/dev-perl/Email-Reply/Email-Reply-1.204.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.204
+inherit perl-module
+
+DESCRIPTION="Reply to a Message"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Email-Abstract-2.10.0
+	>=dev-perl/Email-Address-1.800.0
+	>=dev-perl/Email-MIME-1.820.0
+	>=virtual/perl-Exporter-5.570.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Email-Reply/Manifest b/dev-perl/Email-Reply/Manifest
index 3d7e9349c521..23cbf59ca83f 100644
--- a/dev-perl/Email-Reply/Manifest
+++ b/dev-perl/Email-Reply/Manifest
@@ -1 +1,2 @@
 DIST Email-Reply-1.203.tar.gz 15942 SHA256 54128578569d76fe0089e6f7632e298484d034d1f50c63e85f2926fecbed3db0 SHA512 2c4a0a93ad8b85688b2518b27a3b9d4e13ef6591aea83cb255af1074d40b56461a33432c364564b5aac7489775bae4984fbda005725f267b006bfb821dc95693 WHIRLPOOL 796920dc9fa9e1c2f8a6f589a900e26b8255f614055aa5ef7d79434f20f9da79b6f95c5d0f8b5da1b55b73877a68bdc11a0477a3df12e0965a2e32ff5c844ac5
+DIST Email-Reply-1.204.tar.gz 19079 SHA256 ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0 SHA512 78353abe415fefbf4c70398433584221bf037eab09f4a6a20bcafec4e0a632a5ee07a880e33f806f61fe3a943b7f55c428d90bbc5ea9d5c551eb78e0ff88ac5a WHIRLPOOL d8ae418fd10788862171aeaffe991f4ef78232b4936ae8280246a1043b647a576527db98417e3d0f1a49d577e90e589f0b27141eacfb67639bc67a14ed23bbf0
diff --git a/dev-perl/Email-Sender/Email-Sender-0.120.2-r1.ebuild b/dev-perl/Email-Sender/Email-Sender-0.120.2-r1.ebuild
deleted file mode 100644
index efa17fc0aa9d..000000000000
--- a/dev-perl/Email-Sender/Email-Sender-0.120.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.120002
-inherit perl-module
-
-DESCRIPTION="A library for sending email"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-File-Spec
-	>=dev-perl/Email-Abstract-3
-	dev-perl/Email-Address
-	dev-perl/Email-Simple
-	dev-perl/List-MoreUtils
-	dev-perl/Net-SMTP-SSL
-	dev-perl/Throwable
-	dev-perl/Try-Tiny
-	virtual/perl-libnet
-	dev-perl/Moose
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31
-	test? (
-		>=dev-perl/Capture-Tiny-0.08
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=do
-
-src_test() {
-	# https://rt.cpan.org/Public/Bug/Display.html?id=54642
-	mv "${S}"/t/smtp-via-mock.t{,.disable} || die
-	perl-module_src_test
-}
diff --git a/dev-perl/Email-Sender/Email-Sender-1.300.11.ebuild b/dev-perl/Email-Sender/Email-Sender-1.300.11.ebuild
deleted file mode 100644
index 8bb290acb455..000000000000
--- a/dev-perl/Email-Sender/Email-Sender-1.300.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.300011
-inherit perl-module
-
-DESCRIPTION="A library for sending email"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-File-Spec
-	>=dev-perl/Email-Abstract-3
-	dev-perl/Email-Address
-	dev-perl/Email-Simple
-	dev-perl/List-MoreUtils
-	dev-perl/Net-SMTP-SSL
-	>=dev-perl/Throwable-0.200.3
-	dev-perl/Try-Tiny
-	virtual/perl-libnet
-	>=dev-perl/Moo-1.0.8
-	dev-perl/Module-Runtime
-	>=dev-perl/MooX-Types-MooseLike-0.150.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.31
-	test? (
-		>=dev-perl/Capture-Tiny-0.08
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=do
-
-src_test() {
-	# https://rt.cpan.org/Public/Bug/Display.html?id=54642
-	mv "${S}"/t/smtp-via-mock.t{,.disable} || die
-	perl-module_src_test
-}
diff --git a/dev-perl/Email-Sender/Email-Sender-1.300.16.ebuild b/dev-perl/Email-Sender/Email-Sender-1.300.16.ebuild
index ca438f14ebf6..002242ed91ff 100644
--- a/dev-perl/Email-Sender/Email-Sender-1.300.16.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-1.300.16.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Email-Sender/Manifest b/dev-perl/Email-Sender/Manifest
index 8125f9f5e49b..a0445bd9e163 100644
--- a/dev-perl/Email-Sender/Manifest
+++ b/dev-perl/Email-Sender/Manifest
@@ -1,3 +1 @@
-DIST Email-Sender-0.120002.tar.gz 41956 SHA256 ac0501043cc7d8d92294532126c9903e55003d6830542de3efe6c0da6c19e7b2 SHA512 e2be757caa58528176d361acd617b0aed0ff68501c1f0d540d4403e8763a0def7ff16f866a12537211e704dad1b2aba572072e36add3c0bd5146fbe48ea9a829 WHIRLPOOL 340a00bf6036c18870fa6e75076334c89743c02f13e68c14bdf4a0d00862a5efc32be643a2f2f9b4f86eccc5a9d6e868da446e6f2cd6b02c135cd7bc84fa49cf
-DIST Email-Sender-1.300011.tar.gz 46210 SHA256 f7d372b4199b561ea2f36e821e628eb7a6d9e8bf07cde2ba640858ad7126caa8 SHA512 ed8de53a37038d16c457321a403e4b3380fd3e4af28221f20609c8632309807dccdf281e63de29343bebb55a64d356f12881668261647aa51f15ccff30b0f948 WHIRLPOOL 7ac432f05ecfdddb492fdbe935a9be3189101b31cc418d87055907ff7971929fd8fde405459fa97ae8af62e73097351c7b282458833fbca2c65a00cfe5c339d2
 DIST Email-Sender-1.300016.tar.gz 47240 SHA256 00042de1b78fb26b2ff37bd92c0d61631810725a5235f4841e38a501a533a2a3 SHA512 b64ae8308f066b864bc414d9574a0ab9e04f08aeb31e25b296d740f094c6c4abcd208dbc0b668a9b1fe9dcbbb22e8cfb398101f20d05d1403db320348fdc01eb WHIRLPOOL 5a8a2dd3ff2422b85abd9f269e8584b36e23d14cd94d2b79c68ede86cc4d22f05a799e05ba00f437ae7a8213139385235bf6334e4851aced13001982482ff481
diff --git a/dev-perl/Email-Simple/Email-Simple-2.206.ebuild b/dev-perl/Email-Simple/Email-Simple-2.206.0.ebuild
similarity index 100%
rename from dev-perl/Email-Simple/Email-Simple-2.206.ebuild
rename to dev-perl/Email-Simple/Email-Simple-2.206.0.ebuild
diff --git a/dev-perl/Email-Simple/Email-Simple-2.208.0.ebuild b/dev-perl/Email-Simple/Email-Simple-2.208.0.ebuild
new file mode 100644
index 000000000000..305b273f2e8b
--- /dev/null
+++ b/dev-perl/Email-Simple/Email-Simple-2.208.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=2.208
+inherit perl-module
+
+DESCRIPTION="Simple parsing of RFC2822 message format and headers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Email-Date-Format
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		>=virtual/perl-Test-Simple-0.960.0
+		virtual/perl-File-Spec
+	)
+"
diff --git a/dev-perl/Email-Simple/Manifest b/dev-perl/Email-Simple/Manifest
index 81e53edc3e14..881f448894b8 100644
--- a/dev-perl/Email-Simple/Manifest
+++ b/dev-perl/Email-Simple/Manifest
@@ -1,2 +1,3 @@
 DIST Email-Simple-2.203.tar.gz 34856 SHA256 a528d7531ff773e80d79e0d30b1845ee453561c5f060623397a609e315baeb43 SHA512 69dbacb379dac96d478e9fb98b11de724516e9d591b09a5f1f3866c3c3fc23458d0914271f52b2625b18cc06f229a20a7711341a88616b27c9ed5843a25786d1 WHIRLPOOL 61a4b7f3707b637f5c39cd39d174347c61c3e1ee042d75391daaa3c9d876609222d1a702d7a6ba87e340c71484b1e7ef858566468e49b21a36a8a55893ebe068
 DIST Email-Simple-2.206.tar.gz 37604 SHA256 42147dbe8ed9fbe4c8b02bc89491016880225444ec3219384e53285be4f0b7a5 SHA512 4980247a98e7192b47f7307245b66056e5e6a1fb684c262be6121d094c75e57b69884817b121ad632d515a4f06275ac91e716cbec400ce6a51a60433a0fbbbe1 WHIRLPOOL 5c33ff5ee33a016dee64740b81ca4491455183c8b324766fbd89eae3ca1a385fdd0c5a4c96992bac8c04637bce2d8a67d9ba58970144b214c7d9f0cfb617997e
+DIST Email-Simple-2.208.tar.gz 38289 SHA256 f13a83ecc41b4e72023066d865fc70dfbd85158d4e7722dca8249f54e0ec5be1 SHA512 fee04ac6dfef6c0f48899a3d95662fbb8f2b803969a7d317a6ee82b2f7de4dc0e7a14388d4589e04963d8d6377b7033f0b3f4c57f761b20d3001267bb80ec647 WHIRLPOOL b333e846245caee4fadfcc543c078688e4c2956335768f1b511f3ca33c2bc9a43a70e605facf1f3b7b7298d63356882110457782bc5834cb534d9bece59cfac8
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.14.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.14.0.ebuild
index 1844ccc7fbaf..df6be1c5fd9e 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.14.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.14.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Runtime module handling"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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 ~mips ~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/MooX-Types-MooseLike/Manifest b/dev-perl/MooX-Types-MooseLike/Manifest
index 7e82552c070d..847e750d9653 100644
--- a/dev-perl/MooX-Types-MooseLike/Manifest
+++ b/dev-perl/MooX-Types-MooseLike/Manifest
@@ -1,2 +1 @@
-DIST MooX-Types-MooseLike-0.27.tar.gz 15307 SHA256 ee35e2d85d48bb2785449a4fa42c67513e843c803a0d5074665f54a52b550991 SHA512 bfd221e2dd6b2f292b87b6bb3062fc00fa1f90426961c1c6de0dc266e0745e6ec3a3a9443aec006d8e999912c03f24a0735d01a3a4228803b556e14b608f2153 WHIRLPOOL e45a284cd90ee3833d8abaa85913a214d33859c01d9d5511ee0cfe67833ddc066b587ec03730fe63fc583b732c032ac0ef167705a0cfd1e188c737b3894dad74
 DIST MooX-Types-MooseLike-0.29.tar.gz 18804 SHA256 1d3780aa9bea430afbe65aa8c76e718f1045ce788aadda4116f59d3b7a7ad2b4 SHA512 69ddd0d663d1ea23dfc7e47ec35192f1951f195f70f788bac47cc93e98d9e888394c07fc39f1740b7c1fd04f8724f2b0dfa14183fe33bceb9f77c1f1d1b8752e WHIRLPOOL 016683ed19104d1e62908824902ee1fac29214efcbd487b0cf6071dda222554030acce927016e777edfc056a26acede5ec837db56ca05d7845bcfb53b717e56e
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.270.0.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.270.0.ebuild
deleted file mode 100644
index 67bc44d8fb7f..000000000000
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.270.0.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
-
-MODULE_AUTHOR=MATEU
-MODULE_VERSION=0.27
-inherit perl-module
-
-DESCRIPTION="Some Moosish types and a type builder"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Module-Runtime-0.12.0
-	>=dev-perl/Moo-0.91.10
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Set-Object
-		>=dev-perl/Test-Fatal-0.3.0
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild
index bcaf4fd04b86..15ec51c00c69 100644
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild
+++ b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Some Moosish types and a type builder"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Throwable/Manifest b/dev-perl/Throwable/Manifest
index e5eb16087787..fad4337725b6 100644
--- a/dev-perl/Throwable/Manifest
+++ b/dev-perl/Throwable/Manifest
@@ -1,4 +1 @@
-DIST Throwable-0.102080.tar.gz 12455 SHA256 a556bf38e6cd80216e60eb2e61bb4612703cc7ba093a8c60c9afde3c04a45f6e SHA512 098365cb1d7e0ecb90ec0a3074eda779fe58240e0024f5ed6b3f0d713d871ff1282044984635ef49eed55e3a3097110743d9fa844e1351db77b4bcbd3b2255d1 WHIRLPOOL f0ecd575784ea6a953e506ff22f1c1e14afdee247e39a974e682e5ab5d7a5f73de0772d9b0271804be4c7b047a07a152a25d2883e902118f3a510f6a551f2013
-DIST Throwable-0.200003.tar.gz 15706 SHA256 f33106239b5f9b02fbc6dba7f6bb9d48cca3b620bf07761d4e8a653ec079424f SHA512 7b280001c4f948dbb37f3090ff315ad5a2739256fb1281dc3d23c8d991ab1c488f24ff76f31ec5febe37fea4e022c4ca43404c2b207a08a509915159adb6fbcd WHIRLPOOL 8e8e3de2effafd7c66d8f9713919befd826e259442e3cb167e3bd655c70f14c1e9755c1e2d96defeaf3d1779a962a9238cca3946d88c790fe0892d83c92b7235
-DIST Throwable-0.200004.tar.gz 15830 SHA256 dda2f5c50ecf92e19a5a294d175ca44364ffcc4b7b88e5eac0461dd63219a30e SHA512 57d6fd9c95cc1a02e397367083226b4b9bc3276cb533caebb2299e24e7d9ec33d948e481f57916c7f64750ec71c2b6f6a30e3a8fe0eb34d743436eaad41e03de WHIRLPOOL c614510936aff1d104fcc5aabc261e218c4a2b859a24b8bf17e1b19083dc834f8c7071c84485c38c34dd868b857ed3b6e854344688c00eb6fb151efe44390fe4
 DIST Throwable-0.200011.tar.gz 17883 SHA256 fb090176f1755a2d1c9f180b60a451579b32fad1a2a1f25fcc0fb5f88795516f SHA512 5a807c2c74bd07be190213645081f551436366ec37a50a005c50a8aa5938bf4dea2dea7b8bbfcb46b9e9954f92151e5e98defe63df547b4fde11ffd0478f325c WHIRLPOOL 72591982ea4ce138382c2928724d91c7fd978ce40d9b8422ad7b336902e368f56fc19e414c3c5ee7cc414a94efc73f1c6f4ac974246eff8c0ee612d29d7227c8
diff --git a/dev-perl/Throwable/Throwable-0.102.80.ebuild b/dev-perl/Throwable/Throwable-0.102.80.ebuild
deleted file mode 100644
index 3824ec8ce444..000000000000
--- a/dev-perl/Throwable/Throwable-0.102.80.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.102080
-inherit perl-module
-
-DESCRIPTION="a role for classes that can be thrown"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Devel-StackTrace-1.21
-	>=dev-perl/Moose-0.87"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.56"
-
-SRC_TEST=do
diff --git a/dev-perl/Throwable/Throwable-0.200.11.ebuild b/dev-perl/Throwable/Throwable-0.200.11.ebuild
index b17e3df8479c..64d3a118eb65 100644
--- a/dev-perl/Throwable/Throwable-0.200.11.ebuild
+++ b/dev-perl/Throwable/Throwable-0.200.11.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A role for classes that can be thrown"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Throwable/Throwable-0.200.3-r1.ebuild b/dev-perl/Throwable/Throwable-0.200.3-r1.ebuild
deleted file mode 100644
index 3201ef299c11..000000000000
--- a/dev-perl/Throwable/Throwable-0.200.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.200003
-inherit perl-module
-
-DESCRIPTION="A role for classes that can be thrown"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Class-Load-0.200.0
-	>=dev-perl/Devel-StackTrace-1.210.0
-	>=dev-perl/Moo-1.0.1
-	dev-perl/MooX-Types-MooseLike
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.56
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Throwable/Throwable-0.200.4.ebuild b/dev-perl/Throwable/Throwable-0.200.4.ebuild
deleted file mode 100644
index 0adec52ec9f9..000000000000
--- a/dev-perl/Throwable/Throwable-0.200.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=0.200004
-inherit perl-module
-
-DESCRIPTION="A role for classes that can be thrown"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Class-Load-0.200.0
-	>=dev-perl/Devel-StackTrace-1.210.0
-	>=dev-perl/Moo-1.0.1
-	dev-perl/MooX-Types-MooseLike
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.56
-"
-
-SRC_TEST=do
diff --git a/dev-perl/dbix-searchbuilder/Manifest b/dev-perl/dbix-searchbuilder/Manifest
index ca17a7e56c75..4672e1388dae 100644
--- a/dev-perl/dbix-searchbuilder/Manifest
+++ b/dev-perl/dbix-searchbuilder/Manifest
@@ -1,3 +1 @@
-DIST DBIx-SearchBuilder-1.63.tar.gz 107851 SHA256 2dc89fc29e804d4b702bc774e78ff54fc8b7867dab5ba140a3b7c7040a87a337 SHA512 9b1d8f9a594fb3f1ded031142f28020aaf8a68bcc6fa49001b27b8f0638896f9c96135b62691c80ad82d93937cf032d145bdaaa35ecfce3732924a0751e04ed9 WHIRLPOOL 86c9ec9c8082dace50ffc2eda5432d617a07e1b5261b1b1c50dc2ce2bbd93409ce687716f195290921e31bd02c74b4bc7aaafd06ec97c02ca850db4b73a9808b
-DIST DBIx-SearchBuilder-1.65.tar.gz 115442 SHA256 4b91265f6543031a9a267e10d5c7bc6926f100d19ac1edae36793227419ae349 SHA512 37abd5a0664a5b0ed08a1172f98545480682493766045797757ba551d18dba23537749fdc6647b47c5f5a337c80b7fa153f76e017c28b653fb8da10a1154b3ce WHIRLPOOL 08956d989a8aef3ec73bb8fda0e4e0bbdcd9ac40b7015785aa4809621a448df751212674da3bfa8d08ddba4fcf4b151d736f60efb608d57e91f83498c739b3f0
 DIST DBIx-SearchBuilder-1.66.tar.gz 114777 SHA256 e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e SHA512 e27513701a0712a9d7926c8e0966ee23d60163996c40a83e8d45164af8f9008bb7cf6a567ca1cb8d0226bb8fcf7bf9f1570277fb849c55095d8532ac356d5d95 WHIRLPOOL ae208460d4cb567521424287b932227bca491da4d3d72bd092e92d52b8bef068fcdc5f506465b88c367bb9d3726183af1411dc99790b9cb5f917ab154c9fd7ff
diff --git a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild
deleted file mode 100644
index bb3485ba399a..000000000000
--- a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=DBIx-SearchBuilder
-MODULE_AUTHOR=TSIBLEY
-MODULE_VERSION=1.63
-inherit perl-module
-
-DESCRIPTION="Encapsulate SQL queries and rows in simple perl objects"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/DBIx-DBSchema
-	dev-perl/Want
-	>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
-	dev-perl/Clone
-	dev-perl/Class-Accessor
-	>=dev-perl/Class-ReturnValue-0.400.0
-	>=dev-perl/capitalization-0.30.0
-"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-perl/DBD-SQLite
-		>=virtual/perl-Test-Simple-0.520.0
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild
deleted file mode 100644
index 8201b8ad5671..000000000000
--- a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=DBIx-SearchBuilder
-MODULE_AUTHOR=TSIBLEY
-MODULE_VERSION=1.65
-inherit perl-module
-
-DESCRIPTION="Encapsulate SQL queries and rows in simple perl objects"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/DBIx-DBSchema
-	dev-perl/Want
-	>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
-	dev-perl/Clone
-	dev-perl/Class-Accessor
-	>=dev-perl/Class-ReturnValue-0.400.0
-	>=dev-perl/capitalization-0.30.0
-"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-perl/DBD-SQLite
-		>=virtual/perl-Test-Simple-0.520.0
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/strictures/Manifest b/dev-perl/strictures/Manifest
index c4c10aa6acd1..4cabcf9bf5f3 100644
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@@ -1,3 +1 @@
-DIST strictures-1.004004.tar.gz 8547 SHA256 12117dbaaaa85e07cbf01d95927ecb5ba8d5ed896c18d7dbc6b4be47b255ee34 SHA512 4baabbe85a6eee762b5743d0960d630d2d4604d43b1bce396841d8bb17f1809e016fde74072b36c9eda078fde0552258eff977c1d90bfbca1f50edf5e6a5613b WHIRLPOOL 311d2f15631c4efe5ca2254a8cc1273bfb783cc8ef844eed2d721fc604e055f503d4edf75a8d3f164c717b13e0ea52a4a3e3e45457ff8e6961996ec517bf29bb
-DIST strictures-2.000000.tar.gz 12389 SHA256 6f92fa6e064bf0b0d6d1597cad5630784e4b3da55d5d8a9373743876a9c9ca7e SHA512 94ecc46877253ff590bf9aba6637bd295e2f95c83d2dcabbcd0b73f7b6de07f2f5cef61f2e4d097057ba200298fb4b9cd992d0d23892433167afab47753bcffa WHIRLPOOL 02d8fd39a9a3e6ff9bfbff79ff9380eceb4a3305f85da9144be4be02a300b92d4890b8439d2fa666dd7fbe8af5e06b3633915919294b700b4539c71be9cdda78
 DIST strictures-2.000001.tar.gz 12689 SHA256 1e738a8ad63ce8c9b447111c8304ae124a3277c2dc17953b4f647581525e20d3 SHA512 2f4ca709e5b7722b7af8514c2cdae62cd3e6f96b2189dbcbf7e8bb9ae55f02e084c418535331484f4e7054812073fd2af9e35e85997629da1e544550bfc0f909 WHIRLPOOL d436da36425fc9810550eda8256c160c5fa3fa4c7ff1397185ec9384658abf2ff36e3a4c0bab1bf35d66aa32e5dc7c439b9eee3c9c2839698c87f5b28d68ecff
diff --git a/dev-perl/strictures/strictures-1.4.4-r1.ebuild b/dev-perl/strictures/strictures-1.4.4-r1.ebuild
deleted file mode 100644
index c3a295e59f27..000000000000
--- a/dev-perl/strictures/strictures-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.004004
-inherit perl-module
-
-DESCRIPTION="Turn on strict and make all warnings fatal"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
-
-SRC_TEST=do
diff --git a/dev-perl/strictures/strictures-2.0.0.ebuild b/dev-perl/strictures/strictures-2.0.0.ebuild
deleted file mode 100644
index 203b59e8bd16..000000000000
--- a/dev-perl/strictures/strictures-2.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=2.000000
-inherit perl-module
-
-DESCRIPTION="Turn on strict and make all warnings fatal"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/strictures/strictures-2.0.1.ebuild b/dev-perl/strictures/strictures-2.0.1.ebuild
index 7f698144ee75..6ce25b2e582b 100644
--- a/dev-perl/strictures/strictures-2.0.1.ebuild
+++ b/dev-perl/strictures/strictures-2.0.1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make all warnings fatal"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index ed6a65c1cdab..e6a9769ed0a4 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,2 +1,3 @@
 DIST autobahn-0.10.4.tar.gz 148147 SHA256 3dd7a7793cead942cb0c06bef5a9f69e64edc174e47fb822702eafd41085933d SHA512 1eb43df9b0c986f1788c6463875765266cfc562155399c326b4e9bf447119fbfc967dcc53f8f8844700d21ebf37df6c596ead8c105918af5c6a8ec09585ce797 WHIRLPOOL b5be6d7f6348dc627fcbd2c60699cbd60e3e14e6494f787275d3890c30bca5804783b7a010faab5d19d19097ac90ddfdfdb1a3aaf6d37e4daef943916bf5422f
+DIST autobahn-0.11.0.tar.gz 149680 SHA256 e7aea216e2a3bb41a4fec235399ece8bfbc0be4ef9567e1ed6927db7fa35f851 SHA512 9f53e2ef7637ddf9aec263fa2db8977c5b7a0d8a1bea6b21c030660d5d17e343cab5f84ebda8b0f97d55e1e4a77a0313805294a3a1487fce004c10a4cddfdc86 WHIRLPOOL f5ade4fc98a14585a8ee9a3e4141a6739668d402ff8c4fd42854062c01de33492093752e08a000f708bef232ce30039b51e0c53553f779da898ef526c861315f
 DIST autobahn-0.9.4-2.zip 175894 SHA256 5bb64191cfdd1cbdd90d8e359b389ef62c0acdffd2f68d16ec01fa0a287262f0 SHA512 7e0d4246b8b1c552b25c2ae36f1923ed9931e3d3ca684039a422773fecd92ca04734a0b24394a9bbc787f245c72b5552522351a7c1c8e500128e7c46c740a3d5 WHIRLPOOL aa0f06b82acbebb97ca2e3c424429ada7169dca5b39237ce082a17440ec9701a307e9fc7f162f957023cfc4c067f8e8b82b9923cb056ffcab7b3e64a61a4aae8
diff --git a/dev-python/autobahn/autobahn-0.11.0.ebuild b/dev-python/autobahn/autobahn-0.11.0.ebuild
new file mode 100644
index 000000000000..4df31003b5e1
--- /dev/null
+++ b/dev-python/autobahn/autobahn-0.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+RESTRICT="test"
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'virtual/python-asyncio[${PYTHON_USEDEP}]' 'python3*')
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/trollius-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-11.1[$(python_gen_usedep 'python2*')]
+	>=dev-python/txaio-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/ujson-1.33[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index ed766961b5d6..83034cc1d130 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,2 +1,3 @@
 DIST bcolz-0.10.0.tar.gz 541803 SHA256 cbe1c18440325058d764b3997fbf988af0257c2a4f7d64ec7150735191fdcc81 SHA512 ac6b30c3a1f1cd32563fcec670bd7b3639173547e8f6d319295358a38d4e39439bb26d7c908b30378d9a384b8667bc75023ebcf35f797a1250bdba1a25cbeebd WHIRLPOOL 5827303b5a8c356e183a88411a466276b9e3fe3e9d0f7999d5cb2923f34a6031816f0b829c7826dc956be312bccbcd4d24820ce4b861e940f2f9b0399cc3ff31
 DIST bcolz-0.11.3.tar.gz 582564 SHA256 8750785f52e39f7b117784ed2909a0a702bb11d3f67c49d781df55618bfead07 SHA512 c47d7d4065ed413a28da84486044fd0d9fe83ab09f0112251d4bb46e5d5b5fdd56bab59a8fea7466bd46d62219fe77b12d1a9e8acb17c503f80b42c16cb60e53 WHIRLPOOL 8544d41086182d2a2e4f00a85c58b32716900f047651cce3fc3e9ff7b7993ae4d98c4b363ec10cd70ee9f23a46cb092ea51430eac4a6fdb6697aeecedee90095
+DIST bcolz-0.12.1.tar.gz 622526 SHA256 a8dafa42cd4f3ca130ecb81f7e778204a12c2180c18fd570ef753de58ee7ddbd SHA512 7c58ecfb1267d5c4791f043034b831af9c40e4b496938805eb1885c251b1269f19a049bbc9f0c80fa127d60ebb191b23ad5b44283340c815261393d51dd558ea WHIRLPOOL 4df337b2b6b6fb0ed571f599ef36a051b945a717ce65e731fc84e71c5cd2dfbe669f5bb57cfed773c290256f34018365bde3593041a0e0801568107b3a50162e
diff --git a/dev-python/bcolz/bcolz-0.12.1.ebuild b/dev-python/bcolz/bcolz-0.12.1.ebuild
new file mode 100644
index 000000000000..9ff258bf743a
--- /dev/null
+++ b/dev-python/bcolz/bcolz-0.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides columnar and compressed data containers"
+HOMEPAGE=" https://github.com/Blosc/bcolz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# numexpr is optional but set hard rdepend
+RDEPEND="
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-0.18[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	if use doc; then
+		mkdir doc/_static || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/ doc/ doc/html
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index ad23fb415a98..bf806cf6d5da 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1 +1,2 @@
+DIST ConfigArgParse-0.10.0.tar.gz 36174 SHA256 3b50a83dd58149dfcee98cb6565265d10b53e9c0a2bca7eeef7fb5f5524890a7 SHA512 852dde26809cae5e45a2055dcc8231e0e55434b3dfad9915afe3a663106d1dc1f410f97cf53dd0fbf60b8d2bfad7b53c051e0a3542a2790ad27e7fa1ca8a92e5 WHIRLPOOL 41822199a74772c698e75941ea31266f3efa2aaf96b12784665cb6cebd53c1d0820c03bd48d622162b956ea2c06992fb96f6cb04555d8f37a64574764f61b560
 DIST ConfigArgParse-0.9.3.tar.gz 18983 SHA256 141c57112e1f8eb7e594a9820e95af897a7fa2d186cef5cff7e08cb3f7252829 SHA512 27b5132e7a87a59e5bc650d6884859c5c9a2f2f3d8d05e123d00c726527db26e021b5413f8e6e54fb311696e6e30fc5c236e86b43a271a10362368818d2ea0a2 WHIRLPOOL 586b06c99dc3c064fb7b7e53a1906fcaac665547accac1e5d7d5e88adecd038d9b8247c4d53566c7bfdf58003292da1dcf3b1e283e9398341409463d04c3c5a6
diff --git a/dev-python/configargparse/configargparse-0.10.0.ebuild b/dev-python/configargparse/configargparse-0.10.0.ebuild
new file mode 100644
index 000000000000..c9ae9e206397
--- /dev/null
+++ b/dev-python/configargparse/configargparse-0.10.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PN=ConfigArgParse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A drop-in replacement for argparse that adds support for config files and/or environment variables"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index 0b7da32f79bc..27a22982781f 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -2,3 +2,4 @@ DIST Flask-Migrate-1.2.0.tar.gz 7288 SHA256 37e548cd0c497194243c8c2e2c6296e72ac7
 DIST Flask-Migrate-1.3.0.tar.gz 8400 SHA256 8d142bcae64d45eda6efab821283841380749653e49030aea59f0059071d134a SHA512 dbec7fee9027f9446c57a3d24b171a59dcde1e7023e20efc7eb578f41b7c5228a6704edf2cf7afec5e2fc5f8c37a76abeae5a1b9cf0d95c132e7e834f31f7b14 WHIRLPOOL f8c43f3427cbd6cc72e39cfb4f4329f9e826b2b71ca3310d6831121c5a6c9f7915d3a5308f885cb27ad2d3d77197d411bda026d9636c25bbc122069c41a011f6
 DIST Flask-Migrate-1.3.1.tar.gz 8608 SHA256 d16342313936b383f30e7bc1863bd38686ac9f187a50df4161014f0207bf290b SHA512 3ed504811560e7af509187fc6850204244dc295a6d7d43505e98363af2ea282fabd2cfc2b54d5f8f5d847a8569c3a4e3fe28a7996bbb28ed829975c4014da324 WHIRLPOOL 09fcc61de8654a257257959af90917afb83b5fc9ffaee1f131eeaf557797e048c8ea740875b8c0cd7de8f10c48b5c5f2bcd33047f6f73b730d001432c1f32da3
 DIST Flask-Migrate-1.4.0.zip 12820 SHA256 e63b1aafc7bec62a63ccb8e0f5856a271ab986a044aa81a022e0c68243439258 SHA512 ca9a94fd18d302f1448c0cc188749a4585cb108efdd02ef5a51d295207a48d54540818734dcc831a068d968a1cf166d45f1815b4f0e44f4fe7455b982293a3da WHIRLPOOL f1dd52a9af10ac6cb4598f544a151e15eba51ceb5b3c742f66299f0e4870a96ce571ca59dc52e01836721add741bf32d2959377804b0f09a14ab4ef76361aaaa
+DIST Flask-Migrate-1.7.0.tar.gz 12895 SHA256 fb74af64d861932e0c0c427813ff87cd353a2a54b0b285c7dabdf62495dda799 SHA512 a6f5bdfe6d0fac166dae852228b7b96c7951df61e21ae503a35f6535c06c31f552afddf95988159b53cf0389b14bd3a3920b5994ce2ef01718906fd8b2647f35 WHIRLPOOL 96c4269409300c43d7c41573c411375000754a2264a9cd5e756bddddef8deed0eaa03d61db04d7615a6f2bfc177563dd2e92c6d302b50374a765ada55ecea0f3
diff --git a/dev-python/flask-migrate/flask-migrate-1.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-1.7.0.ebuild
new file mode 100644
index 000000000000..2c3a39985dca
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-1.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-openid/Manifest b/dev-python/flask-openid/Manifest
index d60228524cd1..2b2b9180e7e3 100644
--- a/dev-python/flask-openid/Manifest
+++ b/dev-python/flask-openid/Manifest
@@ -1,2 +1,3 @@
 DIST Flask-OpenID-1.2.3.tar.gz 40847 SHA256 5674538d05212b3d9a541d6dbe5d121fe2ecbcdd02e336fe772c9b2226f44a8d SHA512 86003beb3b922f3c1151088ae3880966fa52e5fd087be196f6d5e0e57ef3b3310a3b48ada11931a55c08a67583f1e72eab3d52fc2c1581ffb2c521aa07517291 WHIRLPOOL fe8c885e061b98934a7eca4ec075a15c997f81ce831c150eade313bc5e46e64c71a5a33119d53d7ab73d3587a6b578128421d9c95e2ac7f2d732b506cd698f02
 DIST Flask-OpenID-1.2.4.tar.gz 42570 SHA256 7ac41a5816e32a69333f6798046b7bf73d8d9a6c0051ff8c687c336fe1fefcb2 SHA512 3a9cf29c425747fd2f00b0200c99eece4c66b29e3ef56c78c945f9da1029fceb59053798a26209289625c2e2a2e9118531ac2fced82758c76bc8002ec1d58ae7 WHIRLPOOL b072e34245f3e2d504b424769dcbe29c975fbb4133031bf8e4881592ceec99f9ac897b562b37c9cf33a9ef25074513a1d4db2c8b52950147d3e9d6e10c761dae
+DIST Flask-OpenID-1.2.5.tar.gz 43369 SHA256 5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab SHA512 20486b3dc8364842f36bfeb2b8501c75a36ec7a16ecb43e826d67ecb2c91846be4e29f1f0bf616a85c5a264446ddcb7dfa52019c9809e8f6be77822e9f69b003 WHIRLPOOL 652c77bc53dd4199d6119928161a5e645c0c4dedcb2c633b829b5acead4734518ebc0a5f97301300681f3051cd59a0ca608b39d83a633c83dd92ce2b54cf81f6
diff --git a/dev-python/flask-openid/flask-openid-1.2.5.ebuild b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
new file mode 100644
index 000000000000..fa27b59ac47f
--- /dev/null
+++ b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-OpenID"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OpenID support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-OpenID"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/flask-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-openid-2.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-peewee/Manifest b/dev-python/flask-peewee/Manifest
index 1300a8063ea0..90e9071aa543 100644
--- a/dev-python/flask-peewee/Manifest
+++ b/dev-python/flask-peewee/Manifest
@@ -1,2 +1,3 @@
 DIST flask-peewee-0.6.5.tar.gz 702466 SHA256 7b39fac44b86e057a44fc059193e444cefbf3aa7807ba3022fa090ac50ce89c2 SHA512 4e1f01d78d1c778cd95a784920d8cfbddc712b8224d93cd0dfe566ee007b781dc4b353bb27c4240475234660363b2b77093d504bf5ef90f358e116f8373020d5 WHIRLPOOL 14e89a5cdf83dbebe377eead7fefcbc56463c889f753fb56198808f0c739c67a68e39c8ff3ad0a304d0843f99147a9771bf0769a731ad28e2d07d28ae084824f
 DIST flask-peewee-0.6.6.tar.gz 707197 SHA256 eab798e102d0e5d7ddba995ac7a82e34e7da815839fa16ee62aa6e4f4a2ee161 SHA512 046a7f89920986cf6847a6cceeb2ed7994317b5957530f6bee3d371445a7db9cb2500943b29da9a6ccfe5c3372e06a392e140480989eb65811b3b92d6bed9c52 WHIRLPOOL dd28bb5c21eb57b6167a5a24594aa7dd74620c28a01321a59f6f15f9773b5c69cf6bc4a2b49ba0e8e72af6b238546419404c13df8aed146f4ee8695cda5f7636
+DIST flask-peewee-0.6.7.tar.gz 701725 SHA256 06da4feeda28dcd8a800c37da7363bfab0e86fda548dbb789e4b85ef3dca3dc8 SHA512 77c4a9b295f829c11285c2596f83bd08f5a9f63e5e9ae193b1625bd25d426434aa24dfd59d35ef0bf6a1521bbb4f554c414455b7f10ba9d25ec5bf228a8a8c5d WHIRLPOOL 0056c132f03fca8743189c52f725e731477c5189b9b2612bf0fd570966b5b6c6914357d4ab0a25fd73e8cbddf5d46a1c850df3c7946f3eff5166d4e408f193c6
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
new file mode 100644
index 000000000000..09b0fc765fe4
--- /dev/null
+++ b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Flask integration layer for the Peewee ORM"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/peewee[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+	dev-python/wtf-peewee[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 7fe496ab6c7e..529d6d7b3cc9 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -4,3 +4,4 @@ DIST flask-restful-0.3.1.tar.gz 103801 SHA256 b2171bb730511e2fc54d071a5b8d9f5e85
 DIST flask-restful-0.3.2.tar.gz 106082 SHA256 0b91c5ac2fdfa3cebb25c2110ab24636833e5209eb186a8bd109f563a355ae1f SHA512 e35901f297ed9ec76f4be94c9511a12b7370f00ed959a22fab6804e739a13bf885023f00baf3fad29a59cc873c9d5d0b2e85b7e4657d3203983dc6775d71c89a WHIRLPOOL 7403fafbc37e8080731c7ad71076e986f2a06d30a216257bb10c08c5d230a88a4bde043af13e590be976e8c1953a829fe76827bb5a10db638dddf8b28282f9da
 DIST flask-restful-0.3.3.tar.gz 109947 SHA256 0aeb8f00c96335f90df304a57f36caecd12befccd333a39708f8929f0a528042 SHA512 f8e48048a25b38a09321efc98649970d959d41bf5cc15f5111e1326396ff305b2dbca757a3198a4ed8cf59a6d0144a981178926c1fecc462132888198b4dd8e6 WHIRLPOOL d4db2f013fb92a593731ea19eba6f0daf0f498ebc9fca17f1da8d23b75e243323004e8fe7425813740dc6bcd9c80780a1836a1f37d403a35a94667ecf8fa8a93
 DIST flask-restful-0.3.4.tar.gz 110669 SHA256 c991d85187e1e0e3e58713d62fc8543fe51d7479ee04151061cf9e452e1e2161 SHA512 3f4debac812ddb511f77802e184e24d1ebf023fd282ba37375484260118cafbad479033deed4e5cf9d2681880059fecf9ac34aafad230186f3e3e1cca2f2033b WHIRLPOOL 96e2a0d007fd8042d2e0d344c7042abf24cc3649b11a36330965a1ffaeeb8a21a04651cbdd486757e704b39773a5b8f8146e6d4ddb4477ad462b1ae7edc74567
+DIST flask-restful-0.3.5.tar.gz 113214 SHA256 30f3433c32d3251b83779034513994df93635db81bf5cd5122a4e0415dd3f5c1 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a WHIRLPOOL d8d0673380263c25e84ed3e86a83b04bae88761c8f3456dcab7d6d58b9884b1b984c28c861bc091c9693b080c15f2f47f99ff6a3003a7f89dd50df851a7d3af5
diff --git a/dev-python/flask-restful/flask-restful-0.3.5.ebuild b/dev-python/flask-restful/flask-restful-0.3.5.ebuild
new file mode 100644
index 000000000000..161e096c9dee
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/"
+SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples paging test"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-uploads/Manifest b/dev-python/flask-uploads/Manifest
index 2062a55cf232..ae046cf99083 100644
--- a/dev-python/flask-uploads/Manifest
+++ b/dev-python/flask-uploads/Manifest
@@ -1 +1,2 @@
 DIST Flask-Uploads-0.1.3.tar.gz 9312 SHA256 2ed695257bb9e3ab93aacf88022f78e1167c748ba8ec19c180ede4af36a4d4de SHA512 eb52c8b22ecc909a37149a9b6df91f47bff0f48ef768325a6e8cc1031b1c1977894a1aaaf70726484316de1782daa26ea96d24114d10490b0d271b2a87efd8ae WHIRLPOOL 9a240e9b797d535622cbb7fbc324a7763ec53e3a9a3d0267176fbc202013c4bb2a3671515320f3157b6086de8b8cd653154080bffa69fe082710109be6789c6c
+DIST Flask-Uploads-0.2.0.tar.gz 7628 SHA256 6623a74e426408e59e392b7f9a4d070112b92d71a974a691fa33c21224c1294f SHA512 7151dc5bad2813040afac84434518a3dc6df7394b60add31a26d5e19c10d42b78729eebfd5ef5a12e289ca73377f0a20b5b4b649036eba9d9e494c054d3e4efc WHIRLPOOL ec47b1aaa6cb801ed08aa4c38ff84613c23ec17c8fc947718627522d049bc02ded827ebd343ba0692df21b048d443c8785281fdafdd63b47c3d056cf21e20bc2
diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0.ebuild
new file mode 100644
index 000000000000..ea8dc086196a
--- /dev/null
+++ b/dev-python/flask-uploads/flask-uploads-0.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible and efficient upload handling for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/
+	https://pypi.python.org/pypi/Flask-Testing/"
+MY_PN="Flask-Uploads"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index de665f77b1f9..d95d869318b0 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1 +1,2 @@
 DIST Frozen-Flask-0.11.tar.gz 106927 SHA256 c348e0165b161efa44770157eba3e006cc6a1e9867bfd74670cbc56529cc5512 SHA512 a734c6e090f08b01756b677a577c013e0198272a9e469410be81e5214eceb34d98e163410e8e04850036c58c5e7c9e718145e69cd26dd9e30c821f6949aede76 WHIRLPOOL 60a54174665e96b4f3921b72bb1f5f313f53c983d84e3dc6fd917f7273ace98a364638d925776eb5cfa6b709d8ee7c935cd3b9bbbb8926550513e3a54e517d59
+DIST Frozen-Flask-0.12.tar.gz 107829 SHA256 8e4f638a1476427ea359f6d90691d96bda71b74e7b00faab48532442079ca736 SHA512 d781b687628890c8372943a10347c219114a2400f896c64d86a64758eb2de12660941b074e518916de0f9c99807ea68915b20fdf46f2bcd659f2cb1c9bda9f65 WHIRLPOOL 9cab0b92d2a7c81bf30bbdde26400a723217ef99221de1636046a42f051bc30c30e109f27a1ee3ebbd8438e7776d8b27baa8310b9619802fa75a169056e8f85a
diff --git a/dev-python/frozen-flask/frozen-flask-0.12.ebuild b/dev-python/frozen-flask/frozen-flask-0.12.ebuild
new file mode 100644
index 000000000000..b0db49061b86
--- /dev/null
+++ b/dev-python/frozen-flask/frozen-flask-0.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Frozen-Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Freezes a Flask application into a set of static files"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' -i docs/conf.py || die
+		mkdir docs/_build || die
+		sphinx-build -c docs docs docs/_build  || die
+	fi
+}
+
+python_test() {
+	nosetests || die Tests failed under $"{EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 88fba6d60782..ef2b4ad0bb0f 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1 +1,2 @@
 DIST iso8601-0.1.10.tar.gz 8405 SHA256 e712ff3a18604833f5073e836aad795b21170b19bbef70947c441ed89d0ac0e1 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168 WHIRLPOOL dc491a7b1b22e9cdf6b49b92c9378273d887a9a7760a501abb08931ffec0e07368ce378a69a2e91b95bb068b56a6d4f60e77e57079111694e05bc080eddb6a1f
+DIST iso8601-0.1.11.tar.gz 8725 SHA256 e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0 WHIRLPOOL 99f80758f28b80d45ff27c31d431546262a011473c714248562259811de143133a1eee34fb835993d612af1419960b3692c9f3cb9824a0c9c440d1e9a54bc9de
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
new file mode 100644
index 000000000000..38a4d0e8ea23
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jonpy/Manifest b/dev-python/jonpy/Manifest
index 142ad248f2b1..68e482eb50e9 100644
--- a/dev-python/jonpy/Manifest
+++ b/dev-python/jonpy/Manifest
@@ -1,2 +1,3 @@
 DIST jonpy-0.10.tar.gz 51672 SHA256 33f43845b6403a2596d89e2210ba043d73facd39937e04eb59d0b7ef683b9456 SHA512 2dcea6798e186a1bfd767f3a0b331ee5ca56e2c0df63b8ac1f3ac53c9906ca98387a0d47166c11057cee62dc669de0771eba6e72d59d5ecd0e88b2fcd5b70281 WHIRLPOOL 8a9e7334d31f822bab462cee321bb520922f070ca569588881ed741ebf0580967d2222f1caf521941a3db3bd8b801f825e485c11dd481a5c66975e293878666f
 DIST jonpy-0.11.tar.gz 51496 SHA256 983f0af78c6a4cdf843da8449a297681be358476764a06ccdd0cb838a6979a7c SHA512 9fa925259a5d56347b71845fc0ed00f16f4b411b350a08f0779f8f867fc34d0c6164cb0dc107410b6b88d1565fc504cabd102a0c7fcbb86e7163319a235d89ee WHIRLPOOL f3166d7cf06c64cde822baee35c15449eedf31b342a5eea5786eb5ee83645fcc6a93537ec0654e5d851ab9ab5880a17039eaa367708ee13df0d36208bc0cba86
+DIST jonpy-0.12.tar.gz 52094 SHA256 29b12dc0a2564d61ae80b92e4d2e90dfeaa5003e58d0803e5b0b6fe64d17534d SHA512 27cd15ac7eae88e5287267fa178cc699ebbb4e3d2c81106d2d7714ad25472abd7189c1fbab8e948eb179a4b261a1983ae897d3424b84aa70245122663e311b75 WHIRLPOOL 8618cae1446375001c1e86c274a01b1b3c7d6b5fd3511977b60be31ac24b0cb16c420694d8ec0627efce661a8131882fbd30bf861604137ff82f7b4b37e8c625
diff --git a/dev-python/jonpy/jonpy-0.12.ebuild b/dev-python/jonpy/jonpy-0.12.ebuild
new file mode 100644
index 000000000000..9d22404498b3
--- /dev/null
+++ b/dev-python/jonpy/jonpy-0.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 131e8a166e7a..b44f97831230 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,2 +1,3 @@
 DIST logbook-0.10.0.tar.gz 107284 SHA256 ff227d9a48dcd539f25bdab26d36dd2ba1459bcc5ebce2926e92fecc917e5d26 SHA512 121fb5ed24a2c53b357d17d31c63c6d305014f5c9aa248df2b251e0c15ce1e7052be380b3032c3bdec0b767278b0b5d4a3f998ac596336f681ac6d353e0ed533 WHIRLPOOL 79700e9165b6c1f9ffe2f118c1033ce713a364b15ca3c1798f80c4f535411464fb329cd639ec0fb1887c542601554be444dd9e6f7b828f6bcc315af4d287f453
+DIST logbook-0.12.3.tar.gz 115932 SHA256 2f3a974d05f7e414bab529cbaa5a7b0faba661516df2e978995247066da86d23 SHA512 0b4242ec476b8e6bbcfaf6db75848e3d36b343c62a83e338a6d3fe7ec8029a0199a7dec783cf27cc2a5a4586a8b9ba938c939dc6121079525fbf608e34eefb7f WHIRLPOOL 877b25d9116af4e7752841abf17f14db830bc0d3d6fff87a552e04c6dcb0e9d80871e2853a3e259fb61491952ebfd46d31b406baab97dee8bbd76634fee9cdc2
 DIST logbook-0.9.1.tar.gz 106615 SHA256 e2f49e922c7836a58418b1cb2680e71492f45150cb968afced9f6a98222e3524 SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188 WHIRLPOOL adfb8bd28565ec97904c63631c55ee17613fdf2259d039baa0351df870bfa1658ebc52c8dbf69c8b94b0230577f287b215324d95b186cf38cc4d68bb1040d502
diff --git a/dev-python/logbook/logbook-0.12.3.ebuild b/dev-python/logbook/logbook-0.12.3.ebuild
new file mode 100644
index 000000000000..a86c3ef1c6bc
--- /dev/null
+++ b/dev-python/logbook/logbook-0.12.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
+
+python_prepare_all() {
+	# Delete test file requiring local conncetion to redis server
+	rm tests/test_queues.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index a0c9b74d85d0..7273644e9e8e 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1 +1,2 @@
 DIST Nevow-0.11.1.tar.gz 563061 SHA256 89d7f6943cf81ccef8dde4016caa1cba977b9366e7aa0660b54239828b421efc SHA512 a7e52fbf6915498e77a41fb100d4c688fcd0567deb56ec946adf1b1712bcfbec7b7a55c551e414606218146772d5274973af7851a78878635e900a4df5193a53 WHIRLPOOL a82ca1334abf201ef9fcf22e579be778e819c488df8c9f774bef7f13041aa996f630408f4a8428e74b2e79df1904dbdf2f858fb79526a9417c1872da95a24963
+DIST Nevow-0.12.0.tar.gz 564213 SHA256 ba044912c8ae532680f70ee3b538a5aef7a4e78c6e5ab247121de0b01b6fc369 SHA512 6dbd46b41e8381e71d2ee766d069c4a49bb307c37539ff31a0d83d4f9ca3bcb05fd74f32df45d052d5c9c9628fa3bddaaa41d03fa7a50db4f4dc0b8e20cf5287 WHIRLPOOL 34f75eb35c20e1fcc05b2b345e5b2b205d3ff004a030a3719bd81b99ed8e0e7ce26a902cccd950d72a9954e412c6c7ee97d0a5b9311131efbed09928d33b65c9
diff --git a/dev-python/nevow/nevow-0.12.0.ebuild b/dev-python/nevow/nevow-0.12.0.ebuild
new file mode 100644
index 000000000000..3ab5dafb4539
--- /dev/null
+++ b/dev-python/nevow/nevow-0.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
+HOMEPAGE="http://divmod.org/trac/wiki/DivmodNevow https://pypi.python.org/pypi/Nevow"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+TWISTED_PLUGINS=( nevow.plugins )
+
+FAILING_TESTS=(
+	nevow/test/test_url.py
+	nevow/test/test_loaders.py
+	nevow/test/test_appserver.py
+	formless/test/test_freeform.py
+)
+
+python_test() {
+	# See bug 355237
+	rm -v ${FAILING_TESTS[@]} || die "can't remove failing tests"
+	trial formless nevow || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# TODO: prevent installing it
+	rm -r "${D}"/usr/doc || die
+}
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index ca37cd4ed5de..ccfb91f5d8f3 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1 +1,2 @@
+DIST pika-0.10.0.tar.gz 82642 SHA256 7277b4d12a99efa4058782614d84138983f9f89d690bdfcea66290d810806459 SHA512 8a6e8b870aa36f141a24d4886cd8e4d4fb5cb735d87857a16ad963d7a14e0c40e81a3c7e193d879046a7e76fa87ab0b16bfd4a000e169e2452815fcd04db93eb WHIRLPOOL 390a5c31eb2dd7aae183ffbb6a82706c3ecfd6366bf3986adc3455627ac9dcbfb1dd78e057aee05f31f8770ceeb764af885db689b54e22bfabb9f925fdff3d60
 DIST pika-0.9.14.tar.gz 72651 SHA256 5e2be3cb4ebdc267abd8e481c09bc30e95919a24e3a5f3f69744959490ead0e3 SHA512 c5b279c48341cef7b86d11414159de778afd3cf043d0ba8ba45adff6e8fbf72ec39642ed533c4d3674df3555fdaa0d7ff32a1844001bc56c1c380643d075870c WHIRLPOOL 3f73bbf4b892b9f60a5c113dd65027103de84578cad895b306fcff9ec02861429d4e32a8ba4a22f5def2a1030e8f10dceffb8f9c715d3bb845394fe012c6808f
diff --git a/dev-python/pika/pika-0.10.0.ebuild b/dev-python/pika/pika-0.10.0.ebuild
new file mode 100644
index 000000000000..26dee82841c3
--- /dev/null
+++ b/dev-python/pika/pika-0.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the AMQP"
+HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/protorpc/Manifest b/dev-python/protorpc/Manifest
index 46cd038e3119..6b5a508aed3a 100644
--- a/dev-python/protorpc/Manifest
+++ b/dev-python/protorpc/Manifest
@@ -1 +1,2 @@
 DIST protorpc-0.10.0.tar.gz 116667 SHA256 9c612f2898cfd769feae6257b0dcf01e0aff29d5d0a2207c3fade4d49434aa4f SHA512 39932f365f25f73b0badfb868e4be13d24a57aa2388ee8802da46420aa8af053a0f26f51c97599dd5a221e66d0b99ff2743d8dccbe03c42fdbaa9e5f9c8e8fa6 WHIRLPOOL 41ad941b97a90cfac7438bb3ed062ad448f8938ecf5a58d9968cc48cdce73b59e7bdc541ad6b61196c249cd6b13b9e3daab59498b3093b4a7743248baacdbba7
+DIST protorpc-0.11.1.tar.gz 117047 SHA256 b81d5594541fdc3d51f9ce75096db0ddb566df840d8609ffe11e5a84574c0b88 SHA512 6f9b64a54bbb10bfa16d0caef8ead49f68cdc6efc3fa21e231cadc01bb3f8a217fc0fe3d77da5140b46e5edfeef4b27c5f05a92ad2d3090627940130df2e51e0 WHIRLPOOL 724f171772305896e231e7701aae4e0a3c06dda49acdb48cd3d54a7b1677ff4850f29d8ef45d225e59ab3bc208f271a28723ec6d62af58b4031c95cbe13ffb5e
diff --git a/dev-python/protorpc/protorpc-0.11.1.ebuild b/dev-python/protorpc/protorpc-0.11.1.ebuild
new file mode 100644
index 000000000000..75346dd7dcbb
--- /dev/null
+++ b/dev-python/protorpc/protorpc-0.11.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Protocol RPC"
+HOMEPAGE="https://github.com/google/protorpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
index cd81175b0372..4b408a1e53fd 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
@@ -25,7 +25,8 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-cache[${PYTHON_USEDEP}] )
 "
 
 python_test() {
diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
index 7f42c4bc0a1d..eaff3d74a34e 100644
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
 IUSE="doc test"
 
 RDEPEND="sys-apps/attr"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
index 784a6dfc876c..ef6073bc1db8 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.10.1.ebuild
@@ -19,7 +19,9 @@ IUSE="test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial )"
 
 python_test() {
 	py.test -v -v -x || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index fd0ee65dd8b4..570690ee3a14 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1 +1,2 @@
 DIST txaio-1.0.0.zip 33656 SHA256 4b38afc5d416b23426ed4e7f582d949317df5173c50efec999f2cc97ed368a57 SHA512 7ca543721139e3da96e86d3d2feafbd0901df7a48585f43f46407a17c226e24bbd18841c50bf911c3f208d614c9e32bfc0a7bee37b03b9ddea87a8a47e940572 WHIRLPOOL d11ea36f27d26566a5dcce83751a723ac2e33c51ecc7019b95d66014850e94fc820ae44b36cbbe3c5a3f5b86de666a2b59cec29194ca3d4b9d39908bb47b2556
+DIST txaio-2.2.0.tar.gz 33225 SHA256 5aa536f69d7a52bfe528863e783f20a70138269ed97d134222fdab6afa0dfe14 SHA512 13c4345fa0e64e86cecfa56e3cfa02ed088eed37dee582cc62b35b9e0984041a458ee837cdcb4ae56966e102f504b0cce8750d5ba8240c83815ca076d2deb979 WHIRLPOOL e75c5fc76f294d17e156b58fe69bb4719bc36a3966367b5e930bb9fef8e026d9a107ea0d883e1f7be569f4dfd0d85b472500a87c51fc012987c80f6d9352e774
diff --git a/dev-python/txaio/txaio-2.2.0.ebuild b/dev-python/txaio/txaio-2.2.0.ebuild
new file mode 100644
index 000000000000..ebf436d31040
--- /dev/null
+++ b/dev-python/txaio/txaio-2.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="a helper library for writing code unmodified on both Twisted and asyncio"
+HOMEPAGE="https://github.com/tavendo/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
index b0660cb35ba4..c894d14e2b84 100644
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -17,10 +17,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE=""
+IUSE="test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
 	app-arch/unzip"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
new file mode 100644
index 000000000000..9e75ffbf4525
--- /dev/null
+++ b/dev-python/urwidtrees/Manifest
@@ -0,0 +1 @@
+DIST urwidtrees-1.0.1.1.tar.gz 12916 SHA256 08a66d0e76e94bc32bc590e35ed283e8a6b0c93adeb431dc576ec0a345f09bfd SHA512 9494cc3c4fe72b468443bbaef0d95f5288ed0dc3a8be00a3bbc261b9b3c4a3752df2f89e439082ed91ba89790c5ad656850d874b5e934cc5a23e87eea8fe4df0 WHIRLPOOL 929d69e4e05fb8e1d68263948b46be5fdc55c480e2678d59d85fa05bd68f795979d97c4fab3f6c8e5d74a71c2375d4805d19f4d44e3def87750dfaad2bdee192
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
new file mode 100644
index 000000000000..09adda987e26
--- /dev/null
+++ b/dev-python/urwidtrees/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a Widget Container API for the urwid toolkit. It uses a MVC
+		approach and allows to build trees of widgets.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.1.1.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.1.1.ebuild
new file mode 100644
index 000000000000..c63efff47c61
--- /dev/null
+++ b/dev-python/urwidtrees/urwidtrees-1.0.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tree widgets for urwid"
+HOMEPAGE="https://github.com/pazz/urwidtrees"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
+		-e '1i# -*- coding: utf-8 -*-' -i || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}"
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		pushd docs || die
+		emake html
+		popd || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc; then
+		dohtml -r docs/build/html/*
+	fi
+}
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index db429fba62ce..cb7ffbb86ee7 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,3 +1 @@
-DIST chunky_png-1.3.3.gem 346112 SHA256 4078934795bf845e4015da25d5a64822a286105e62e8cb85c9c94a7ad02d82d1 SHA512 ea9039a88bb26662863faff98248e8a903e2169fab376b74fc2b17b62f6a2b0201ff67902c596d61a98bec74adb5110bca31c0a6e0f5bf201eef3534f234cf8c WHIRLPOOL 72966631bb53c961573a60eb881a850801617eca512a7a47122d0647dcb50dbe0c673f0ba79c4ac244eb20d7b2886cb8ba1862f76527cef12b06d6b9126c4560
-DIST chunky_png-1.3.4.gem 349184 SHA256 dc71b0f6bfd38dd9040faa7b1b2ea90c2bfcd5971ee9040785d1b93de484bd58 SHA512 dbcabaf5b5d5627fbf9bf8de3b5692117b71255b25c062068f879fc75c293939d7ff552e9e2a29ca26d711fd00bb9c40385cb36e50c4fcccbaec6d122fa29ca0 WHIRLPOOL a3d92d2106a3a2ae6587acfd57ead27d1f38b9783a80342e0838230259caf5f5661510b070b0bc6aa8289e0f15a7bd3d68338d9aecdaa3f9c4dbc13c52a4a82b
 DIST chunky_png-1.3.5.gem 350208 SHA256 b6ab1011b2e79bcc973c92deee4110d071d5cd59ed950efcd0aba49a5f57c06d SHA512 3c036da20a77bf3525f2d76711e3dee697360dce59c0aee13e57f6cd6a77e7cde0bc94be15ba3c8792e45652d6825f520f8d16f5bc90ca2315a9b3ce17870494 WHIRLPOOL e7ac53ed0b2f959d0016a87c48140382f07477cb061558ae25120e04bd4947ca399321520b0fe508f4e481763c72ab4ae03a693e62486d58e0c3482b371990fa
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.3.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.3.ebuild
deleted file mode 100644
index 2a1c96fa53b7..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.4.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.4.ebuild
deleted file mode 100644
index a5735ac976b6..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.4.ebuild
+++ /dev/null
@@ -1,34 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/ethon/ethon-0.8.0.ebuild b/dev-ruby/ethon/ethon-0.8.0-r1.ebuild
similarity index 85%
rename from dev-ruby/ethon/ethon-0.8.0.ebuild
rename to dev-ruby/ethon/ethon-0.8.0-r1.ebuild
index 01ea1dfdae66..9f6534c2f9ae 100644
--- a/dev-ruby/ethon/ethon-0.8.0.ebuild
+++ b/dev-ruby/ethon/ethon-0.8.0-r1.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
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/typhoeus/ethon"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND+=" net-misc/curl"
diff --git a/dev-ruby/faraday/faraday-0.9.2.ebuild b/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
similarity index 93%
rename from dev-ruby/faraday/faraday-0.9.2.ebuild
rename to dev-ruby/faraday/faraday-0.9.2-r1.ebuild
index d72206c7afba..9352db8c3395 100644
--- a/dev-ruby/faraday/faraday-0.9.2.ebuild
+++ b/dev-ruby/faraday/faraday-0.9.2-r1.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
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index 879510c9952e..c76a042c0d2c 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1 +1,2 @@
+DIST lumberjack-1.0.10.gem 25600 SHA256 64eb76f7898436256c359dc8ee54924d8fe24f35159ff553e0a9243c90449e46 SHA512 5800b0324d33b7481d69fe2d05805eff358f91807477e052d8c815d61ff5ebc1b9879e8914de0bc911b9bada4dc7448f180af0538fc108b6e79a19ce104805e4 WHIRLPOOL a860707819a3926af64f8d8cd8f547661e1d207dfbf7fafb0cfaa1cfc9a5e71d712b308b8e2487010ef3cd61874da032dfae2dc626d9b2225ed7cb1b0f951f78
 DIST lumberjack-1.0.9.gem 25088 SHA256 940484987b3b063aa18d83169816cc9a81681451b869c690bca878be44cd4e98 SHA512 0106f9e4e669e34f45f6697b7c001661009ea6aa993cb2227160034b3ab5439d7e126ec30936bdb59b0aed23bcee6c43bc6b515d18325898061078e068222459 WHIRLPOOL d3fa1e9e9db76e68bf7bf88f3edadde2464de6372b7748134c8b0af8db605647813191d72eb4ce28b252ab2c9133f7ad9cd2f97b5d94fe4ec997dca5baef8859
diff --git a/dev-ruby/lumberjack/lumberjack-1.0.10.ebuild b/dev-ruby/lumberjack/lumberjack-1.0.10.ebuild
new file mode 100644
index 000000000000..5394dda85e96
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.0.10.ebuild
@@ -0,0 +1,20 @@
+# 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="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="https://github.com/bdurand/lumberjack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
similarity index 79%
rename from dev-ruby/multipart-post/multipart-post-2.0.0.ebuild
rename to dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
index c49e37049618..835263a659bf 100644
--- a/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-2.0.0-r1.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
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/nicksieger/multipart-post"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r1.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild
similarity index 76%
rename from dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r1.ebuild
rename to dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.ebuild
index 4c2b13060cf9..9e60eaac29cd 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r1.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-2.9.4-r2.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
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-persistent"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "doc? ( dev-ruby/hoe )
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 3d01f7746ac8..0d06e58b87d7 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,3 +1,2 @@
-DIST ox-2.2.0.tar.gz 173019 SHA256 33fad7a3cafa38f62ff65ee93485028048d2369e504fd8c80a65cef7d9566c8c SHA512 817eae55ae3f0ee3edced2da58be2e0c95b2be0e8788f511b648f88d38096367416802f2e82a2dacb7ec48efdd35cb8c36766ffb7b46a4944137e55bf23bd02a WHIRLPOOL 82adce4c9465c28dacd8514279ddf40832ac47e4c48355758c91681835e81124eb3233b2d15081b542775acd2501622ff85cf6d4146fd10ec8a6f435d0e1b2c1
-DIST ox-2.2.1.tar.gz 174511 SHA256 67d064cd52c174ee0539f2ca1398b8afc64c22f7cfa5f12749d28fc25d03a9cc SHA512 3ad836e0446f39ac16d4fad9ed85b3c7711531e9db0c9bf2582bfaf08ccb198fa758d0e3193a9916ec4161dd06ef19468bee64590e2671caabd62cc604ab0f98 WHIRLPOOL 5c83081b44dd5e8da84161dbbb568ad25e5c52c8df9c6565a38610eed0b71d67acf971ffd018796b63e9d4f6ef17af0e7bf02f23bd4788f85317781af7a5f6ff
 DIST ox-2.2.2.tar.gz 177795 SHA256 10720a2c26ebfb6e9074bdead42fa3550fd60ecf1a5962a4adf9b928feb71800 SHA512 ea9120dfc8e0289b82cce1950e9c3d1556ce08d91b1314ba3040bfd19f575d312814d6aec86f2563a070ccd6709c5a2c2c2e89f44177de9c293dccbf4137efd9 WHIRLPOOL e6920ff898799f36080714cf1c4820b6bb739b619494184d5a5bae140e80fee7ee694f292340612d4ca28763bd034da357aa516b7bbd5fe315aa86201bd105e7
+DIST ox-2.2.3.tar.gz 178109 SHA256 d359a87fc43dc83d2cfe1db14866c18321387c9c9006adb35e05929e15612c7b SHA512 13159a58f3b37e0c8be4e29335f3d8a251337531c0c9a7460496c6cf25b957aaf6c2ce86b872c8c2207b76a88e0957d1a53983f411f5e7cf2b3151f84a3492b8 WHIRLPOOL 8a22f73cb18c2a1d8b0f9a61aef0113797d78cd7b25f7431b44b9f99ade46be701ac98c88edd8a4408cd65b5df69cf63607f13c6888153a28d5eb9d986aad55d
diff --git a/dev-ruby/ox/ox-2.2.0-r1.ebuild b/dev-ruby/ox/ox-2.2.0-r1.ebuild
deleted file mode 100644
index 5e36f96bb5e3..000000000000
--- a/dev-ruby/ox/ox-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.2.1.ebuild b/dev-ruby/ox/ox-2.2.3.ebuild
similarity index 94%
rename from dev-ruby/ox/ox-2.2.1.ebuild
rename to dev-ruby/ox/ox-2.2.3.ebuild
index 78b4037af536..54688b526ce7 100644
--- a/dev-ruby/ox/ox-2.2.1.ebuild
+++ b/dev-ruby/ox/ox-2.2.3.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index 2961e07f9410..5d86ca7df1f7 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,2 +1,2 @@
-DIST paint-0.9.0.gem 22016 SHA256 cc87ffd4c796489fb8d14e69a7e2a0ebc031f0318d555712b5842e981d3b96b9 SHA512 a56c62cac15d3e14699f5044ad19408f704cdc243e34f2ac451cbcf68a9417a4e9a51fe0e9a17218b822c9a382fd328151d4bfb7f729c95c2c32b32fa514a216 WHIRLPOOL 816af7d20b4b3ce94afdc1fc52005dd4717800e99e961235e89f84da1d27824c0d9422f20cec91224d875b7434c07edb33ea264224b7a3e288204f546c681504
 DIST paint-1.0.0.tar.gz 18392 SHA256 b141f1c1ccb43ee1d7e3c6e4a42a9465846de0664efec8e2cd231e813f1eb7de SHA512 15461471d5a6eb08402e78bd9f86c99322d4e6ba1fc24054240190270021fdd2105070e99602799d65fed53f8065da012e0351462d82572cf7015760eb1946b1 WHIRLPOOL 11d55f6b42195dc3e436957f1f02936087d56416baafbfb29311300db24c8ac1056a1ce5dee0d3edd4fe413e2e281b6a8b0f1923f8207accbb11564dc93eb241
+DIST paint-1.0.1.tar.gz 18598 SHA256 d717b4ef06302e7b05100aad269f9a89f398c913114ec4f07be9d68d5af2b269 SHA512 480f37fa22896636a591a6491a1329797f35a146ff92b623a4c287adfc52d67d972c61ba16e6d8c3135d985553bc19c12afffdf9bc161575d6dabe9131c4a359 WHIRLPOOL ef9d0e89b9084fbcb9dc9dc9cdf80175282e39c071da826ae03da323d3bf162738c65b26e7d225d101b8736fc85b211909ace88b1401be0a8423bc8f00a26bf6
diff --git a/dev-ruby/paint/paint-0.9.0.ebuild b/dev-ruby/paint/paint-1.0.1.ebuild
similarity index 63%
rename from dev-ruby/paint/paint-0.9.0.ebuild
rename to dev-ruby/paint/paint-1.0.1.ebuild
index 70a95f32fcbe..bf9a05c15a8a 100644
--- a/dev-ruby/paint/paint-0.9.0.ebuild
+++ b/dev-ruby/paint/paint-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# 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="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
@@ -14,6 +14,7 @@ inherit ruby-fakegem
 
 DESCRIPTION="Terminal painter"
 HOMEPAGE="https://github.com/janlelis/paint"
+SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-ruby/patron/patron-0.5.0.ebuild b/dev-ruby/patron/patron-0.5.0-r1.ebuild
similarity index 83%
rename from dev-ruby/patron/patron-0.5.0.ebuild
rename to dev-ruby/patron/patron-0.5.0-r1.ebuild
index 1731d1a7e70f..ca677e14b620 100644
--- a/dev-ruby/patron/patron-0.5.0.ebuild
+++ b/dev-ruby/patron/patron-0.5.0-r1.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="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -15,7 +15,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 50402ad0a65b..7cdc79a05531 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,2 +1 @@
-DIST pkg-config-1.1.5.gem 19456 SHA256 c821a08679b447e9665639d7c12b6a1d566530dcc9920c2d5dfd5e2e7cab06a7 SHA512 3f5fa5f255dc8c8838eb742e0b3654de7d00155fe8c41e007ae51cc01c5380182a24ee0b4718d76e5b76ad1deb917d429db61d3ffc995a774381722749b82cdd WHIRLPOOL 8d281d5b02cb71fdcb5dd899b817ac255b81db070f892f05ab312f21716f61805e954e8b882442deb9de04bb80e302648997ae206faaa5f3eb505447d82c05cd
 DIST pkg-config-1.1.6.gem 19456 SHA256 f89c285286d9bb1607022225d042d8ff96d41d2755d4de80611d52f3ab0f7626 SHA512 089aec86cf008d1dca3fa6ee6604ef5860cd404671e23b539eb82a4654255eecddd142d0249e0c89dad7a467a5252ed3afea665cda8bb4012ae5ec8e24d2d825 WHIRLPOOL 619d85ad9e7ce5adaf4731abebbbe2e089571defac38f147c528e1f0a99d0f5345e0ecb7b0f27c999353dc5b4e22df0771a25403a6c31d1cb550664c3fbcfef8
diff --git a/dev-ruby/pkg-config/pkg-config-1.1.5-r1.ebuild b/dev-ruby/pkg-config/pkg-config-1.1.5-r1.ebuild
deleted file mode 100644
index 4decff3c1767..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.1.5.ebuild b/dev-ruby/pkg-config/pkg-config-1.1.5.ebuild
deleted file mode 100644
index 0ac810804417..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
index 5118be1f8865..8b99412bb167 100644
--- a/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
 
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 8bdbd302ceeb..a28c88cf2128 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,2 +1,3 @@
 DIST rqrcode-0.6.0.gem 25088 SHA256 8a57b341e4fc148ef105b16a9ad1eea883a40a55dac9949804cd6431119d30f5 SHA512 613f91855696ec8b95b3879f0639cb5057066e21d5d80714b1cb63cd3dfefbb69fe0baa890d269b326c033febbad2e3705b024bd6baaa550e703b6dac09d10c0 WHIRLPOOL 27a5ce83237a2327409da75d73825a3301d8a154aeea9d581648953a9dec4911c306be6ff77d1b22a543b11420c4dbf1f3861cc4747fa7bca2375c4038549593
 DIST rqrcode-0.7.0.gem 25088 SHA256 8b3a5cba9cc199ba2d781a7c767cb55679f29a3621aa0506a799cec3760d16a1 SHA512 ea336b24d43113821100f96680740d265456ebfda46f064b17e0a51295ca945203d03f0be27d3c6b86398393ba9d102f339db4708ec36d09f90cb240d16a6d3c WHIRLPOOL d74324bbc835368583e526c23bd5f4f57d7e2abd83940da9f05833518788815eca8c6d9b61bdf090640ae0a6efd0cc7e0aad3d4de179e373905a78c879578931
+DIST rqrcode-0.9.0.gem 27136 SHA256 31b84b2203fb3892f5d9d86ae5ccb67420031d7cb06c3739214e88afc6968130 SHA512 80ce9fcfac53bc23818fe6bf49dec088df298e1c8232245cea1f423e0a78b4e19342aab39a80165ca3ff41076eba2ab80b2ddd5564283d748950305f6d545b2f WHIRLPOOL 65d076daab72dff9714581790190a2dd3ea963f33f1eb2d31933c73341b89d93062220f9488338c22c76ad96922cc534b95155574e34eb65ac8db06007af8d5f
diff --git a/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild b/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild
new file mode 100644
index 000000000000..290f7c43c614
--- /dev/null
+++ b/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# 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="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://whomwah.github.com/rqrcode/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/chunky_png:0"
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
+	sed -i -e '1igem "minitest"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/ruby-poppler/files/ruby-poppler-3.0.7-type-orientation.patch b/dev-ruby/ruby-poppler/files/ruby-poppler-3.0.7-type-orientation.patch
new file mode 100644
index 000000000000..50f5f52ef84f
--- /dev/null
+++ b/dev-ruby/ruby-poppler/files/ruby-poppler-3.0.7-type-orientation.patch
@@ -0,0 +1,27 @@
+From 3dda85661515d71101f1028dc7d68d4e53de45b1 Mon Sep 17 00:00:00 2001
+From: Kouhei Sutou <kou@clear-code.com>
+Date: Fri, 25 Dec 2015 23:36:00 +0900
+Subject: [PATCH] poppler: remove needless POPPLER_TYPE_ORIENTATION binding
+
+Poppler 0.39 removed it. And there are no Poppler releases that use
+POPPLER_TYPE_ORIENTATION.
+
+GitHub: fix #653
+
+Reported by Rob Brackett. Thanks!!!
+---
+ poppler/ext/poppler/rbpoppler.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/poppler/ext/poppler/rbpoppler.c b/poppler/ext/poppler/rbpoppler.c
+index 2b28f95..fb3bfed 100644
+--- a/poppler/ext/poppler/rbpoppler.c
++++ b/poppler/ext/poppler/rbpoppler.c
+@@ -56,7 +56,6 @@ Init_poppler(void)
+                                 INT2FIX(POPPLER_MICRO_VERSION)));
+ 
+     G_DEF_CLASS(POPPLER_TYPE_ERROR, "Error", RG_TARGET_NAMESPACE);
+-    G_DEF_CLASS(POPPLER_TYPE_ORIENTATION, "Orientation", RG_TARGET_NAMESPACE);
+ 
+     G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION_TYPE,
+                 "PageTransitionType", RG_TARGET_NAMESPACE);
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.0.7-r1.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7-r1.ebuild
new file mode 100644
index 000000000000..e37472e8a72b
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo]"
+DEPEND+=" app-text/poppler[cairo]"
+
+RUBY_PATCHES=( ${P}-type-orientation.patch )
+
+ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/if have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests downloading a test PDF directly.
+	rm -f test/test_{annotation,document,page}.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/webmock/webmock-1.22.3.ebuild b/dev-ruby/webmock/webmock-1.22.3.ebuild
index 9dbacf4f6857..9fbf81604d3a 100644
--- a/dev-ruby/webmock/webmock-1.22.3.ebuild
+++ b/dev-ruby/webmock/webmock-1.22.3.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-# ruby22 → spec failures
 USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
@@ -30,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.2.4
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.6.0:0.6 )"
+	>=dev-ruby/http-0.8.0:0.8 )"
 
 all_ruby_prepare() {
 	# Remove bundler support
diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index 7a81a421c4c1..93a4a647c7fb 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-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$
 
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
+DESCRIPTION="Development tool to help write Java code that adheres to a coding standard"
 HOMEPAGE="https://github.com/checkstyle/checkstyle"
 SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
 	https://dev.gentoo.org/~sera/distfiles/${PN}-5.4-maven-build.xml.tar.bz2"
@@ -29,11 +29,7 @@ RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.6
-	dev-java/ant-nodeps:0
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
+	test? ( dev-java/ant-junit:0 )"
 
 java_prepare() {
 	cp ../${PN}-5.4/maven-build.xml . || die
@@ -55,11 +51,12 @@ JAVA_ANT_ENCODING="iso-8859-1"
 EANT_BUILD_XML="maven-build.xml"
 EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava-18"
 EANT_BUILD_TARGET="package"
-EANT_ANT_TASKS="ant-nodeps"
 EANT_NEEDS_TOOLS="true"
 
+EANT_EXTRA_ARGS="-Dmaven.repo.local=/dev/null"
+EANT_TEST_EXTRA_ARGS="${EANT_EXTRA_ARGS} -Djunit.present=true"
+
 src_test() {
-	EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 	java-pkg-2_src_test
 }
 
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 42cf2f35f05e..6721f68ef83e 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,3 +1,4 @@
 DIST geany-plugins-1.23.tar.gz 3642803 SHA256 b0e79c1cd679a5b5f02632922920478a1047c3a5985982a1cc2348fa7e4454c4 SHA512 68ba0c96712cd6ea944ff68810378a96a411717a0950bfc72f5aade36bf6e5b065d229beec3b5724921c2eaf4ddb73a19f4ae77137a96208fef52f739d65c6ef WHIRLPOOL 56e54586611f8e804059b489d54d2e3970f9cf7c958e99169eeee96472c2d7848aa446bc74a150bd32ec18aa6daaba030939facaada376327fea5e90e2a15e9c
 DIST geany-plugins-1.24.tar.gz 4037065 SHA256 2e5fa09afe7710cdc2eebae3656d56561429d5df8898c6b5dc91915f15aec0fc SHA512 947bdf8bd602ae5576d3298029d7249ac40881c13cb3676123c92f4b183be200126d0e19e5c0697c237e5a8d3d9f2d7d715b0cd562f98a059af9fa5d4f3e611e WHIRLPOOL 4386cedfef05c5f4b0bb218122b20a84167bc0b2e43b06bf080ac21dd111b57d9fbf770af78d16394d0ee01592849fae8466e8467bc05176fafd331ba0f7d2a7
 DIST geany-plugins-1.25.tar.gz 4425813 SHA256 0114042ed82feacbc1ad8c9e88dfaf6d109d01470429193c6f973079871b4615 SHA512 c0a9100e212fcf804e3013fec70a46cb925f48d3a88c4aea3ca50ddeeeacb3ec7b175d89dd041a47be2d4c5d84f31564da19d0c383a40b2811530113d061e761 WHIRLPOOL 1daa0e2b45470bf0dc30053b5e4d1da2a2dde26ffd073d8dbe806256172c39d3f60686944bca1789555330574895eb388cfcbccee461b58b80cb28c33b905f88
+DIST geany-plugins-1.26.tar.gz 4429565 SHA256 da55e8dd5d6918de3014aaeb7ca8473d0a818ed064f77e3fa5b6aedef781b85b SHA512 3714e7c3aa2720cb91630ba26ee6018a57dfce304d556934bd6a88e4d25e9666868eeb5592a4132e7e481d42db850a0266dba6cbc2439cb0e824a3040c45850b WHIRLPOOL c006e318e107af847910489050d9d55b4a7e856c4409605f159c97717e82436eccb4d486d5bcfa044c3b88a14c8b78de2680a097b3e77c5b9c99c3c72206ba6e
diff --git a/dev-util/geany-plugins/geany-plugins-1.26.ebuild b/dev-util/geany-plugins/geany-plugins-1.26.ebuild
new file mode 100644
index 000000000000..e106bab6887d
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.26.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-single-r1 vala versionator
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="http://plugins.geany.org/geany-plugins"
+SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit"
+
+LINGUAS="be ca da de es fr gl kk ja pt pt_BR ru tr zh_CN"
+
+COMMON_DEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
+	autoclose? ( x11-libs/gtk+:2 )
+	commander? ( x11-libs/gtk+:2 )
+	defineformat? ( x11-libs/gtk+:2 )
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	ctags? ( dev-util/ctags )
+	debugger? (
+		x11-libs/vte:0
+		dev-util/geany[-gtk3]
+		)
+	devhelp? (
+		dev-util/devhelp
+		gnome-base/gconf:2
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+		)
+	enchant? ( app-text/enchant )
+	gpg? ( app-crypt/gpgme )
+	git? ( dev-libs/libgit2 )
+	gtkspell? ( app-text/gtkspell:2 )
+	lua? ( =dev-lang/lua-5.1*:= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		)
+	multiterm? (
+		$(vala_depend)
+		x11-libs/gtk+:2
+		>=x11-libs/vte-0.28:0
+		)
+	python? (
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+	scope? ( x11-libs/vte:0 )
+	soup? ( net-libs/libsoup )
+	webkit? (
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf:2
+		)"
+RDEPEND="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# bundled lib buster
+	rm markdown/peg-markdown/markdown_lib.c || die
+
+	autotools-utils_src_prepare
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	# GeanyGenDoc requires ctpl which isn’t yet in portage
+	local myeconfargs=(
+		--docdir=/usr/share/doc/${PF}
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		--disable-geanygendoc
+		# peg-markdown is bundled, use app-text/discount instead
+		--disable-peg-markdown
+		--enable-geanymacro
+		--enable-geanynumberedbookmarks
+		--enable-projectorganizer
+		--enable-pretty-printer
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-xmlsnippets
+		$(use_enable autoclose)
+		$(use_enable automark)
+		$(use_enable commander)
+		$(use_enable ctags geanyctags)
+		$(use_enable debugger)
+		$(use_enable defineformat)
+		$(use_enable devhelp)
+		$(use_enable enchant spellcheck)
+		$(use_enable gpg geanypg)
+		$(use_enable git gitchangebar)
+		$(use_enable gtkspell)
+		$(use_enable markdown)
+		$(use_enable multiterm)
+		$(use_enable lua geanylua)
+		$(use_enable nls)
+		$(use_enable overview)
+		$(use_enable python geanypy)
+		$(use_enable scope)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable soup geniuspaste)
+		$(use_enable webkit webhelper)
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
similarity index 93%
rename from dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
rename to dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
index 8fe0854a20a5..bc2e18f1f334 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
@@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	classbrowser? ( dev-libs/boost )
 "
 RDEPEND="${COMMON_DEPEND}
-	konsole? ( $(add_kdeapps_dep konsole) )
+	konsole? ( || (
+		$(add_kdeapps_dep konsolepart)
+		$(add_kdeapps_dep konsole)
+	) )
 	cvs? ( dev-vcs/cvs )
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index f58625905757..c89d85e2b861 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,5 @@
 DIST pycharm-community-3.4.1.tar.gz 112821686 SHA256 96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64 SHA512 3f5a4c8c598ed0fe1a28335b63864a5597fe6da3d6de225ada93bbe4342b81db8cc0a96f297b5f0ebe9608b8507f9293419790805b7e24e0151175e952ecd421 WHIRLPOOL efd62eb960902ab26983f51b2904209315b5a9535d6f0c0a45bc9d90df87cafc9d2d720d20e702b1846c0d2083af4e529f6de15184d73996da6164b4b8a38ac2
 DIST pycharm-community-4.0.6.tar.gz 121278114 SHA256 7aa0ed3d743ed6886329671d2e5ae10abdac35d0595cff8d6eeb39ada9168e9a SHA512 b9a20550fac93e9d247da702d8cf2e5c56eba9cb427024d85c76d21547f2e11f037ad12f465f4fdcbd3a8ee7e080bcaebf2b081af100b03953388f97921caba5 WHIRLPOOL cbb42c85a0835c323294f9b7648f8db51fd98b2b936dd92b228ee90e0ac78231d7fe8e16dd114c73380fd1bc6061a178e30483631fc16ee90c3b7a9f2c690d74
-DIST pycharm-community-4.5.3.tar.gz 121605129 SHA256 205247b94965d9499e55d13ec701364475ff823d9353d967744750f6ceadc38d SHA512 0ae316890d6e348024f974a81cca9669c61f005a7af0cd0ef4d2f051fcb71cebbe372446f3a660f9c2a87837d7986809493499b34311a175542751d4f8597753 WHIRLPOOL e3895326751e6fd97a6ec60fc3933fc07b61337668dd18662ab22bb85f41fac1fca2511bf8eccfa0946dffa5f51f9cb24fda6019c88c88e07f281e390e6a37d9
 DIST pycharm-community-4.5.4.tar.gz 121580731 SHA256 6bdd344eb88ee50cf29e98278c87faad0d1a23a7ec84c1794b956d2633024228 SHA512 e0c90fd84d60e1ac644c2b29aef484c1768cf8832c70cbc1a7905b64e0ef0fd7ec50665b9b15fcdaad762852e42103487b59fc4c8d1e711fd3a30123f8c959eb WHIRLPOOL d3725d9f3d983edf111f8aeb903bced2df643e9b39dcff59f21c176a16d9304dfe833ee542e204d1a4f5cdfadb33025587a669f190202bbae83cd9d102250c08
-DIST pycharm-community-5.0.1.tar.gz 134214228 SHA256 8e8b276954b8cc5e5afa79918c50cf60fc21bf5cddce6a6fa2e232627c8da392 SHA512 4f5d193b30e3d30c1bff7f2212ef061595e1f31587c16f2a527d85962ac500d86b4be8abe631f219386ec893693999248fdf92f3bbcd115f3593513e60df2fdd WHIRLPOOL b3b5d49541c4a9c1f6acecac017fc84794b6b33b0d8995a58143258641fe9737c226fe2d488b9f9ace364265885542cb51c07e12d34e7f70027b8d15d9104f31
 DIST pycharm-community-5.0.2.tar.gz 136420461 SHA256 eadc36ae55237b783fbc528b6007e1755606ef7a95b7cc8dec27f44a829e545b SHA512 f8eabd233a70ea27f8eeb8b2307b749673c64a3b1a897c773665959dccfbc43a1f62afab4e9be117e29cfa7d0608ec3cf1a87b4b0d2da44b9c83cf8205d1cdbb WHIRLPOOL acd6948edd78ec17beb9f264985619c662d113b7d8f6c9c549b958d780e974019466eb5e1060705be5f1e75581c106a92bf95ad958357197f4fc0bc3db79f8b9
+DIST pycharm-community-5.0.3.tar.gz 136122878 SHA256 82116e6e5bf41ecd48f4fab04012e4a75eefef9f5856083642c4524461c763f5 SHA512 ee238b71f54cad9dd1e0ee700ec9cab5db5b0f8422b6cb97fa966bdb074ad6b05387a98ad208f87073adbb5fbf31d7c821222f7593791005f5cb3604b965f849 WHIRLPOOL 9bc4f9fb388b8f2b954012ae655c2dd4f3cdd8c30bee91389029aeb3568d54431906e2b5dd34db60768c2ef460cae903346e64a64f5895a6d7574ab07672a2a1
diff --git a/dev-util/pycharm-community/pycharm-community-5.0.1.ebuild b/dev-util/pycharm-community/pycharm-community-5.0.1.ebuild
deleted file mode 100644
index 2d6231557096..000000000000
--- a/dev-util/pycharm-community/pycharm-community-5.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=""
-
-RESTRICT="mirror strip"
-QA_PREBUILT="/opt/${PN}/bin/fsnotifier
-	/opt/${PN}/bin/fsnotifier64"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_src_install
-}
diff --git a/dev-util/pycharm-community/pycharm-community-4.5.3.ebuild b/dev-util/pycharm-community/pycharm-community-5.0.3.ebuild
similarity index 100%
rename from dev-util/pycharm-community/pycharm-community-4.5.3.ebuild
rename to dev-util/pycharm-community/pycharm-community-5.0.3.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index b878be307192..7a45d7b9db0e 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,8 +1,5 @@
 DIST pycharm-professional-3.4.1.tar.gz 145673847 SHA256 e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b SHA512 4f15484e3c0329bad8d89de44435f9d2cce3c3dfeb7bfdbdafe51649557b7f5059aeacd5aaf3e90307254195eefddcdf8c37dfbd67a12acb12d47af89ac6172e WHIRLPOOL b33b72b1eadd3b8ead2a7ec90f2fb121a14e06d632ce34a92105f36391d04d27da1ce8656bf37caccd5a9a7dcf0b13e0f0fe50da1fa4d6a0dea8d317e59b7b07
 DIST pycharm-professional-4.0.6.tar.gz 155933406 SHA256 b914f55dab1bff6e8707ca64b22092a99598009e858e397c39dde26f03e15b71 SHA512 538056c8aeb0eb2d996bfa3a76935866ed52b60e20de3b2f8f5c9a819005826537bac4b04b870d7e9a29a6f60f0d0aa532e0a5f9a348cfa95227afc9d289b1d6 WHIRLPOOL 21c4d811686fbbffa5276d89642cce6578575c543518b49378f2d58b4ed50f428007c622d574d25db6b909baa9f172bc9a772e39f5c21b875562af9b015d5c93
-DIST pycharm-professional-4.5.2.tar.gz 160339662 SHA256 a736a1d648ff7ae742b86ff278b2eeb53c61c875037d44f863b1abc78ffdf7b5 SHA512 3c79ee632554499b13b5d3096a3e60d3c578ef29ae985f7daef0555f217650686f6cd0d700a3a6f8fec809fc11a12c476365a594b167aa76f4720a9dabce66d7 WHIRLPOOL fb69b0cada495ba88872b2c0a38b4b272501a022338d600fc8ccb3cb7ea70c374bf898882e4e35eff2bd199da8ba15e721e765e156e3ee86edb9e3bf019d3c76
-DIST pycharm-professional-4.5.3.tar.gz 160688951 SHA256 5ac0ff2ad0e5a61d93182637ff308c30227f1c2f7e396149a9720782bc336601 SHA512 ea21e30d98bd5f83438fb3c51c366828dc1ab62540b7c22c3164afdd93f338ec677795dc43177e698efc86b72d2337fc3546abb1d78bc388697312afa4f7c018 WHIRLPOOL d89217d63086b5b0213b267eabb301900e0f4fb8b16a69260ba50a153fb7568f5dfbe6dec89f6c64083fd51d9fa089fced55a324a2837cfffd2c1abebffd8db6
 DIST pycharm-professional-4.5.4.tar.gz 160665389 SHA256 0d3a0a627901a1519ee77a0f2b34bc9cd7ba9a20c1276862ed5324187d25c6b7 SHA512 2f0fc1018128984bc1763c263e185763e9f2af03306d61bdc30f229dfd54bf7094e46a3758eeaacd34c9c47bb0522d52f17206ce3da283d52be685a4a34da90e WHIRLPOOL d76ec00b68642fd716bfca94e9465de1855fd4e60dc15a49ae683abc48a172d57dde166b3a13d178680bbe25b54fa863494b01bfdff575d7b0f75ddfb124d39b
-DIST pycharm-professional-5.0.1.tar.gz 183926748 SHA256 038501f116f5b18e5fc30c7b7edf1c076f0ec6d5f2e2c14348004dc8b6745a80 SHA512 1ffd2b8c50600d2ead207ffe6f9439dd3f008258fd530c45587779bb99c4a49f2238d956552add72f908672e69e22712699efd56f1e831f470e496734b6a702a WHIRLPOOL dc4163b7f0986e8ed6cf9643a6612743cb9279537bb8c779bb8f89ef4442ca2033a4c440458625a33860ee00771ee7d903c278a4d413c0ca0db4110009925870
 DIST pycharm-professional-5.0.2.tar.gz 187822566 SHA256 1f98d4c7d1daca6d12734617af622fba0b6aa3e2e7b5d04195e905e099e6ac21 SHA512 7af4562bcd0579a609b54f3a0afc0121661e39c5037403e779af54d1cbb319c2bb784c2816121fb4b79b3f45f13aa8d3d374c30c9eba9a7d95b129a4b6a375eb WHIRLPOOL 4f174029d7b5bee053fe745ef73ca3c665613789729917183489139af0b7fcdd0d1391a08b5b6d1d194b302aeadcd785ecfe74919647a231dd8ca4550de96608
-DIST pycharm-professional-5.0.tar.gz 183117515 SHA256 066ca91c7d810765a96e82673d4241de855b82cd0d46dc88e46f00da00789c9a SHA512 183597e004604cc49dfff674f8fb9c05fa73d1a3e01dc66368f0b49ea2ada653fe28a64181697449d9adeecfda3e8d8e7105bd75aa82f9ccd9331d783146e18a WHIRLPOOL 94b5030d3131ae92c83596ff6c9f547068022048d3bf9cff9d21d3c8664664b4bf9805098bd677fe7f48ad7160f9a6d6923fe930edb99612f6718a4cd1294122
+DIST pycharm-professional-5.0.3.tar.gz 187617093 SHA256 b427ff88079230a1b7f92db044b3382d7dc080e49fbce57e6871587b0c4a4fec SHA512 04cb80e94462f060797d34c79a423133ab17957fbdf188fc438385b2481a19de16d9bb048604f0ca2935560ce444d4d3f1d2811a4cc5e029be889ee19d6aaaa9 WHIRLPOOL bce2f38980c5edbdca224b3a3338f79749f9daa6910f4b4963c1f66f7801a7348faac54ba4fe4bb71e0fa51c1ed0403f4469291b8a2d69b4a56c8f5be802ea83
diff --git a/dev-util/pycharm-professional/pycharm-professional-4.5.3-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-4.5.3-r1.ebuild
deleted file mode 100644
index dfb1dc5e49a8..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_src_install
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-5.0.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.1.ebuild
deleted file mode 100644
index dfb1dc5e49a8..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-5.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_src_install
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-4.5.2-r1.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.3.ebuild
similarity index 100%
rename from dev-util/pycharm-professional/pycharm-professional-4.5.2-r1.ebuild
rename to dev-util/pycharm-professional/pycharm-professional-5.0.3.ebuild
diff --git a/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild b/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild
deleted file mode 100644
index dfb1dc5e49a8..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_src_install
-}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index ce8210e9f1fb..a1081e6c7b77 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,5 +2,5 @@ DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6
 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
 DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443
 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4
-DIST mercurial-3.6.1.tar.gz 4517652 SHA256 d4647943165affd11baf0705556920481d5346b97604babab6ad76f1744474c6 SHA512 5bb157c78f4b6b8fe8d9903a951640c73e2ab010041fd7083d29fb10353772eb2420ec175a59dcd74c118711b8c8a24831426928cc4efabbf1290a971cb6a155 WHIRLPOOL 5cfd68c69ed3520d4fb7595e6bfbec73282a7196386959cfb24fcb54064265490795f26934efa69004a26a1a6a406a7e5b559826d0abb388b8877f92eec000ae
 DIST mercurial-3.6.2.tar.gz 4518349 SHA256 09c567049c3e30f791db0cf5937346c7ff3568deadf4eb1d4e2f7c80001cb3d6 SHA512 2ad780174a30c39a1482d597466523a133b8c62a3a0eb9ac3b183082e279fc624998a9ffa520abafe5f7afc7d9f4600f443ad4dfa1003bd7fdc6b713040091ed WHIRLPOOL cb3270be37b36ad5cfd5f1aac002006b5206daf22504af2143c359bab0d3db19fc7820a03ed819fa80c73610d485f5f85d405b4ad89d0744f79da049afd8866b
+DIST mercurial-3.6.3.tar.gz 4521749 SHA256 402731f27256beb9a575a6991ca3d7059976197c905337f4f5729fd940329fa8 SHA512 e5b39e5456a35e19f2ac02838946305023de957590c5aa2828f7c37e9b5f6f2e6376526d0845ebd1ca198860425d11e208b3c36e12e189e0b02871e9c91aad9a WHIRLPOOL 36f0f6caa43ce2c65c7c2bdfb3fa3935cec1e47c25fae6a6a3c7b00165d1aff9b71c73dd10faad2e2ba096d55cc633366170135d95452c162936fef93571dbf1
diff --git a/dev-vcs/mercurial/mercurial-3.6.1.ebuild b/dev-vcs/mercurial/mercurial-3.6.3.ebuild
similarity index 98%
rename from dev-vcs/mercurial/mercurial-3.6.1.ebuild
rename to dev-vcs/mercurial/mercurial-3.6.3.ebuild
index 1f57c1ef8c43..3587ac1b4f4e 100644
--- a/dev-vcs/mercurial/mercurial-3.6.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-3.6.3.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$
 
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 8041452af250..709ca980a2f2 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -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$
 
@@ -26,7 +26,7 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.14.0}
+: ${FRAMEWORKS_MINIMAL:=5.15.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 6ed2bd7759b2..9aede6d6f79b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -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$
 
@@ -396,6 +396,8 @@ kde5_src_unpack() {
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	cmake-utils_src_prepare
+
 	# only build examples when required
 	if ! use_if_iuse examples || ! use examples ; then
 		comment_add_subdirectory examples
@@ -472,8 +474,6 @@ kde5_src_prepare() {
 			comment_add_subdirectory tests
 		fi
 	fi
-
-	cmake-utils_src_prepare
 }
 
 # @FUNCTION: kde5_src_configure
diff --git a/games-action/lugaru/lugaru-20151204.ebuild b/games-action/lugaru/lugaru-20151204.ebuild
index 9edc210ffc1f..bfa2ee9516b2 100644
--- a/games-action/lugaru/lugaru-20151204.ebuild
+++ b/games-action/lugaru/lugaru-20151204.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/freedoko/freedoko-0.7.13-r1.ebuild b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
index 5ed375597785..016aea6a1ffc 100644
--- a/games-board/freedoko/freedoko-0.7.13-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
 
 RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index f48a436cd76f..51d41c8426fd 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+curl +openal +vorbis"
 RDEPEND="virtual/opengl
 	media-libs/libsdl[joystick,opengl,video]
 	media-libs/speex
-	virtual/jpeg
+	virtual/jpeg:0
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
diff --git a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
index 897e5cd1fb23..5af3a0951154 100644
--- a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
+++ b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
@@ -2,28 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="fast paced, off-handed grapple mod"
 MOD_NAME="Alliance"
 MOD_DIR="alliance"
 
 inherit games games-mods
 
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://quakeunity/modifications/alliance/alliance30.zip
 	http://www.superkeff.net/mods/mods/alliance/alliance30.zip
 	mirror://quakeunity/modifications/alliance/alliance30-33.zip
 	http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip"
-HOMEPAGE="http://www.planetquake.com/alliance/"
 
 LICENSE="freedist"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
-src_unpack() {
-	unpack alliance30.zip alliance30-33.zip
-}
-
 src_prepare() {
 	rm -f *.exe
 }
diff --git a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
index dcb3e69e7565..786351a0d319 100644
--- a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
+++ b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="adds unique new secondary attacks to weapons"
 MOD_NAME="Alternate Fire"
 MOD_DIR="alternatefire"
 
 inherit games games-mods
 
-HOMEPAGE="http://www.planetquake.com/alternatefire/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://quakeunity/modifications/alternatefire/alternatefire-${PV}.zip"
 
 LICENSE="freedist"
diff --git a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
index 19b6a70a52b8..fb1820da3b80 100644
--- a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
+++ b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
@@ -2,16 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
-MOD_DESC="take control of Ki-powered superheros and battle in a mostly aerial fight"
+EAPI=5
+MOD_DESC="Control Ki-powered superheros and battle in the air"
 MOD_NAME="Bid For Power"
 MOD_DIR="bfpq3"
 MOD_ICON="bfp.ico"
 
 inherit games games-mods
 
-HOMEPAGE="http://www.planetquake.com/bidforpower/"
+HOMEPAGE="http://www.moddb.com/mods/bid-for-power"
 SRC_URI="mirror://quakeunity/modifications/bidforpower/bidforpower${PV/./-}.zip"
 
 LICENSE="freedist"
diff --git a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
index 350b88477d7c..0c0b20dc263e 100644
--- a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
+++ b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
@@ -2,20 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="advanced FPS competition mod"
 MOD_NAME="Challenge Pro Mode Arena"
 MOD_DIR="cpma"
 
 inherit games games-mods
 
-HOMEPAGE="http://www.promode.org/"
-SRC_URI="http://www.slashquit.net/files/x/q3/cpma${PV//.}-nomaps.zip
-	http://www.slashquit.net/files/x/q3/cpma-mappack-full.zip"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://packages.vstone.eu/quake3/install/cpma${PV//.}-nomaps.zip
+	http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
index b6d056e697a3..8ae650100623 100644
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
+++ b/games-fps/quake3-defrag/quake3-defrag-1.91.20.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="Trickjumping challenges for Quake III"
 MOD_NAME="Defrag"
 MOD_DIR="defrag"
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
index 25a2e5fcc3e6..5a3899cd532d 100644
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
+++ b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="Trickjumping challenges for Quake III"
 MOD_NAME="Defrag"
 MOD_DIR="defrag"
@@ -31,16 +30,16 @@ IUSE="dedicated opengl"
 
 src_unpack() {
 	unpack defrag_${PV}.zip
-	cd ${MOD_DIR}
+	cd ${MOD_DIR} || die
 	unpack defragpak{1,2,3,4,5,7,8,9,10,11}.zip
 	unpack defragcpmpak01.zip
 	unpack df-extras002.zip
 }
 
 src_prepare() {
-	cd ${MOD_DIR}
+	cd ${MOD_DIR} || die
 	mv -f DeFRaG/* . || die
-	rm -rf DeFRaG
+	rm -rf DeFRaG || die
 	mv -f *.txt docs/ || die
-	rm -rf misc/{mirc-script,misc,tools}
+	rm -rf misc/{mirc-script,misc,tools} || die
 }
diff --git a/games-fps/quake3-excessiveplus/Manifest b/games-fps/quake3-excessiveplus/Manifest
index 676ed7098986..54e9fd320b64 100644
--- a/games-fps/quake3-excessiveplus/Manifest
+++ b/games-fps/quake3-excessiveplus/Manifest
@@ -1 +1,2 @@
 DIST xp-2.2b.zip 19810680 SHA256 4a041f4b84dae4b50707f9069eb0c59b4af00e53bcecd7d0f01087398a165b55 SHA512 b7f702b5ce0b0c39ae0db9414ae54aaec7cf0a80cc39604e8ebd14eae56a982f438196488d1c1cc559c6d36c36c8c0e1b695658f974c196c95bba2274063f343 WHIRLPOOL 377c08cde0d52e8272811c93e3fd00abf531adae20340a811aa8bb376694ea6363f370eba1d94f2d2b342041394eebbe86b8bd7c06381d7ebe1ee88ce8200c5d
+DIST xp-2.3.zip 17266975 SHA256 213adbd718be00c49a6cdc539b0372f99703042d7afa3a6c31740a3bc7e06820 SHA512 80a8663c8d42139661ccd5333f9c543854ad82ae38f7838139c78413f7fa3e163c27a66aed4014e56ca756cabf2fd835179cba2336ada7158fdbde1e2841535b WHIRLPOOL 3c1df12ddf96fc439998089595fdcfecf25c65e3e12f2da7270f4e5a016229e9da66beb246d2515d63fd0c73b36ff7b6e3178be7a2a6b7e1fc96ac896a7be481
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.2b.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.2b.ebuild
index 22755cfa97b9..488d78f47238 100644
--- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.2b.ebuild
+++ b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.2b.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
-MOD_DESC="modification making the weapons much faster and stronger"
+EAPI=5
+MOD_DESC="Makes the weapons much faster and stronger"
 MOD_NAME="Excessive Plus"
 MOD_DIR="excessiveplus"
 MOD_ICON="excessiveplus.ico"
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
new file mode 100644
index 000000000000..488d78f47238
--- /dev/null
+++ b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MOD_DESC="Makes the weapons much faster and stronger"
+MOD_NAME="Excessive Plus"
+MOD_DIR="excessiveplus"
+MOD_ICON="excessiveplus.ico"
+
+inherit games games-mods
+
+HOMEPAGE="http://www.excessiveplus.net/"
+SRC_URI="http://www.excessiveplus.net/files/release/xp-${PV}.zip"
+
+LICENSE="all-rights-reserved"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated opengl"
+
+src_prepare() {
+	rm -f *.bat
+	rm -rf ${MOD_DIR}/tools
+}
diff --git a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
index ef92dc81ad5e..1eae0ac9282f 100644
--- a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
+++ b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="offhand grapple all-weapons capture the flag mod"
 MOD_NAME="Loki's Revenge CTF"
 MOD_DIR="lrctf"
diff --git a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
index d19d4757234f..860fee27ceb8 100644
--- a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
+++ b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="Matrix conversion mod"
 MOD_NAME="Matrix"
 MOD_DIR="matrix"
@@ -18,7 +17,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
-	mkdir ${MOD_DIR}
-	cd ${MOD_DIR}
+	mkdir ${MOD_DIR} || die
+	cd ${MOD_DIR} || die
 	unpack ${A}
 }
diff --git a/games-fps/quake3-nsco/Manifest b/games-fps/quake3-nsco/Manifest
index 84dcb9631a07..b9f7e87e6073 100644
--- a/games-fps/quake3-nsco/Manifest
+++ b/games-fps/quake3-nsco/Manifest
@@ -1,2 +1,2 @@
-DIST nsco_beta191a.zip 335375075 SHA256 3ed6706d09dd7a414563381a52f4cbc8c445031fc7473bf89f6582d1c7916fef
-DIST nsco_beta193upd.zip 55808681 SHA256 6d6102c5946f79d4e6174480d8d42b9a95463131e5e26e7c187e8bb21a535004
+DIST nsco_beta19.zip 314224296 SHA256 0789515b88e8dc499ed97bee3a7df1a4be3657c8f30c519b3687560094988572 SHA512 bf125ab25e841536686e0a4d7de98b62b35f1034e9120daf86a1c2536b189252f22ab0b4105337e311758103cce7a9e1f371d5ba4f859dacbf2d7b41e48952c5 WHIRLPOOL a70b8aa6e86366c3369d06a4b6120a5924bbe8ef21a06efc83c2dfaa9743d86a2cfaf51ae5215042d66dca8f7e7d7c90b28def64431b002be1181a7c3e78b639
+DIST nsco_beta193upd.zip 55808681 SHA256 6d6102c5946f79d4e6174480d8d42b9a95463131e5e26e7c187e8bb21a535004 SHA512 8233a54b65ba29babab47056468fb112cac6a687db151d416dbabb754fe03006db4f0d0bb403e0e44f03d2b6e99428d67aed0fa27d4473331035dea5bc3563eb WHIRLPOOL bdc35b8dd4dfbd3cdb9bf9723eb31cf6904e6b1a42338645c3f40f77ab53f7fa36ada4de4ad57cfc3aaece731c1061ed45ad6674bce940ab7752d28b560f85aa
diff --git a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
index 57bce07a8187..1761aac28172 100644
--- a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
+++ b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
@@ -2,28 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="a US Navy Seals conversion mod"
 MOD_NAME="Navy Seals: Covert Operations"
 MOD_DIR="seals"
 
 inherit games games-mods
 
-HOMEPAGE="http://ns-co.net/"
-SRC_URI="nsco_beta191a.zip
-	nsco_beta193upd.zip"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://quakeunity/modifications/navyseals/nsco_beta19.zip
+	mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip"
 
 LICENSE="freedist"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
-RESTRICT="strip mirror fetch"
-
-src_unpack() {
-	unpack nsco_beta19{1a,3upd}.zip
-}
+RESTRICT="strip mirror"
 
-pkg_nofetch() {
-	elog "Please goto ${HOMEPAGE}"
-	elog "and download ${A} into ${DISTDIR}"
+src_prepare() {
+	rm -rf seals/launch* || die
 }
diff --git a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
index 29628995376d..211c36f2058a 100644
--- a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
+++ b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="a tournament mod"
 MOD_NAME="OSP"
 MOD_DIR="osp"
diff --git a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
index 208d31da6604..8640c5d585c6 100644
--- a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
+++ b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="a rocket dueling mod"
 MOD_NAME="Rocket Arena 3"
 MOD_DIR="arena"
 
 inherit games games-mods
 
-HOMEPAGE="http://www.planetquake.com/servers/arena/"
+HOMEPAGE="http://www.moddb.com/mods/rocket-arena-3"
 SRC_URI="mirror://quakeunity/modifications/rocketarena3/ra3${PV/.}.zip"
 
 LICENSE="freedist"
diff --git a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
index c9efc91f04f7..5d35e7a158f8 100644
--- a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
+++ b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="port of Action Quake 2 to Quake 3: Arena"
 MOD_NAME="Reaction"
 MOD_DIR="rq3"
diff --git a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
index 1ee884d440a4..ebdde672c51f 100644
--- a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
+++ b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
@@ -2,26 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-MOD_DESC="a anime/fantasy mod with cartoonish characters and arcade-like gameplay"
+EAPI=5
+MOD_DESC="Anime mod with cartoon actors and arcade-like gameplay"
 MOD_NAME="Ruin Hunters"
 MOD_DIR="ruin"
 
 inherit games games-mods
 
-HOMEPAGE="http://planetquake.gamespy.com/View.php?view=Quake3.Detail&id=1824"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="
-	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip
-	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip"
+	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip
+	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip"
 
 LICENSE="freedist"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="dedicated opengl"
 
-src_unpack() {
-	unpack ruin_hunters_{v10,v10a_patch}.zip
-}
-
 src_prepare() {
 	rm -f *.bat
 }
diff --git a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
index 34c800346df6..841124016815 100644
--- a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
+++ b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-
+EAPI=5
 MOD_DESC="Threewave CTF"
 MOD_NAME="Threewave CTF"
 MOD_DIR="threewave"
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
index 119a5e9509df..f7360a6a18b4 100644
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -2,14 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# quake3-9999          -> latest svn
-# quake3-9999.REV      -> use svn REV
-# quake3-VER_alphaREV  -> svn snapshot REV for version VER
-# quake3-VER           -> normal quake release
-
-EAPI=2
-inherit eutils flag-o-matic games toolchain-funcs
-[[ "${PV}" == 9999* ]] && inherit subversion
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs games
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -17,8 +11,7 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
 HOMEPAGE="http://ioquake3.org/"
-[[ "${PV}" != 9999* ]] && SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
-ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
+SRC_URI="http://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -44,11 +37,7 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-if [[ "${PV}" == 9999* ]] ; then
-	S="${WORKDIR}/trunk"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
+S="${WORKDIR}/${MY_P}"
 
 my_arch() {
 	case "${ARCH}" in
@@ -63,18 +52,9 @@ my_platform() {
 }
 
 src_prepare() {
-	if [[ "${PV}" == 9999* ]] ; then
-		# Workaround for the version string
-		ln -s "${ESVN_WC_PATH}/.svn" .svn || die "ln ${ESVN_WC_PATH}/.svn"
-	else
-		epatch "${FILESDIR}"/${P}-bots.patch
-	fi
-
+	epatch "${FILESDIR}"/${P}-bots.patch
 	einfo "Fixing libspeex linking..."
-	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die "sed failed"
-
-	# Use system jpeg library
-#	epatch "${FILESDIR}"/${P}-remove-bundled-jpeg.patch
+	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die
 }
 
 src_compile() {
@@ -90,6 +70,7 @@ src_compile() {
 	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
 	emake \
 		ARCH="$(my_arch)" \
+		V=1 \
 		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
 		BUILD_GAME_QVM=0 \
 		BUILD_GAME_SO=0 \
@@ -107,20 +88,18 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice) \
-		|| die "emake failed"
+		USE_VOIP=$(buildit voice)
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO || die
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO
 	if use voice ; then
-		dodoc voip-readme.txt || die
+		dodoc voip-readme.txt
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg || die
+		doicon misc/quake3.svg
 		make_desktop_entry quake3 "Quake III Arena"
-		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
 	fi
 
 	cd build/release-$(my_platform)-$(my_arch) || die
@@ -128,8 +107,8 @@ src_install() {
 	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
 		if [[ -x ${exe} ]] ; then
 			target=${exe%.*}
-			newgamesbin ${exe} ${target} || die "newgamesbin ${target}"
-			dosym ${target} "${GAMES_BINDIR}/${target/io}" || die "dosym ${target}"
+			newgamesbin ${exe} ${target}
+			dosym ${target} "${GAMES_BINDIR}/${target/io}"
 		fi
 	done
 
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index 5a58d6cd6e0f..1d49a5439cb3 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.ebuild
@@ -7,9 +7,9 @@
 # quake3-VER_alphaREV  -> git snapshot REV for version VER
 # quake3-VER           -> normal quake release
 
-EAPI=2
-inherit eutils flag-o-matic games toolchain-funcs
-[[ "${PV}" == 9999* ]] && inherit git-2
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs games
+[[ "${PV}" == 9999* ]] && inherit git-r3
 
 MY_PN="ioquake3"
 MY_PV="${PV}"
@@ -28,7 +28,7 @@ IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
 
 UIDEPEND="virtual/opengl
 	media-libs/libsdl[sound,video,joystick,X,opengl]
-	virtual/jpeg
+	virtual/jpeg:0
 	openal? ( media-libs/openal )
 	vorbis? (
 		media-libs/libogg
@@ -45,9 +45,7 @@ RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"
 
-if [[ "${PV}" == 9999* ]] ; then
-	S="${WORKDIR}/trunk"
-else
+if [[ "${PV}" != 9999* ]] ; then
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -79,6 +77,7 @@ src_compile() {
 	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
 	emake \
 		ARCH="$(my_arch)" \
+		V=1 \
 		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
 		BUILD_GAME_QVM=0 \
 		BUILD_GAME_SO=0 \
@@ -98,18 +97,17 @@ src_compile() {
 		USE_MUMBLE=$(buildit mumble) \
 		USE_OPENAL=$(buildit openal) \
 		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice) \
-		|| die "emake failed"
+		USE_VOIP=$(buildit voice)
 }
 
 src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md opengl2-readme.txt TODO voip-readme.txt || die
+	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md TODO voip-readme.txt
 	if use voice ; then
-		dodoc voip-readme.txt || die
+		dodoc voip-readme.txt
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg || die
+		doicon misc/quake3.svg
 		make_desktop_entry quake3 "Quake III Arena"
 		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
 	fi
@@ -118,8 +116,8 @@ src_install() {
 	local exe
 	for exe in ioquake3 ioquake3-smp ioq3ded ; do
 		if [[ -x ${exe} ]] ; then
-			dogamesbin ${exe} || die "dogamesbin ${exe}"
-			dosym ${exe} "${GAMES_BINDIR}/${exe/io}" || die "dosym ${exe}"
+			dogamesbin ${exe}
+			dosym ${exe} "${GAMES_BINDIR}/${exe/io}"
 		fi
 	done
 
@@ -127,7 +125,7 @@ src_install() {
 	# this should be done through 'dogameslib', but
 	# for this some files need to be patched
 	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe renderer*.so || die 'install renderers failed'
+	doexe renderer*.so
 
 	prepgamesdirs
 }
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 2253492f7ad9..32e875905a41 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -24,9 +24,9 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
 		virtual/opengl
 		virtual/glu )
 	sdl? ( media-libs/libsdl )
-	virtual/jpeg
+	virtual/jpeg:0
 	media-libs/libogg
-	media-libs/libpng
+	media-libs/libpng:0
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 521b0eaa25e2..459116bea577 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=2
 
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="red-blue Quake II !  play quake2 w/3d glasses !"
@@ -25,11 +25,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-ldflags.patch
-	sed -i "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
-		|| die "sed failed"
-	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c \
-		|| die "sed failed"
+	sed -i \
+		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" \
+		sys_linux.c || die
+	sed -i \
+		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
+		sys_linux.c vid_so.c || die
+	echo "$(games_get_libdir)"/${PN} > "${T}"/${PN}.conf || die
 }
 
 src_compile() {
@@ -37,22 +39,20 @@ src_compile() {
 	emake \
 		GENTOO_CFLAGS="${CFLAGS}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release \
-		|| die "emake failed"
+		build_release
 }
 
 src_install() {
 	cd release*
 
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so || die "doexe failed"
+	doexe gamei386.so ref_softx.so
 	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so || die "doexe failed"
-	newgamesbin quake2 red-blue-quake2 || die "newgamesbin failed"
+	doexe ctf/gamei386.so
+	newgamesbin quake2 red-blue-quake2
 
 	insinto "${GAMES_SYSCONFDIR}"
-	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
-	doins ${PN}.conf || die "doins failed"
+	doins "${T}"/${PN}.conf
 
 	prepgamesdirs
 }
diff --git a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild b/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
index c15a4d525692..053d913aec6c 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild
@@ -103,8 +103,8 @@ src_install() {
 		"${T}"/${PN}.conf || die
 	newconfd "${T}"/${PN}.conf ${PN}
 
-	nonfatal dodoc src/*.txt docs/dev/*.txt
-	nonfatal dohtml -r README.html docs/*
+	dodoc src/*.txt docs/dev/*.txt
+	dohtml -r README.html docs/*
 
 	prepgamesdirs
 }
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
index 24db71027d12..cedc1e3b711c 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 62476dfde213..c0a61039c02f 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
 #inherit cvs
@@ -20,7 +20,7 @@ IUSE=""
 
 RDEPEND="virtual/opengl
 	virtual/glu
-	media-libs/libpng
+	media-libs/libpng:0
 	x11-libs/libXxf86vm
 	x11-libs/libXxf86dga"
 DEPEND="${RDEPEND}
@@ -53,19 +53,18 @@ src_prepare() {
 	sed \
 		-e "/^LDFLAGS/s:=:+=:" \
 		-e "s:-mpentiumpro -O6:${CFLAGS}:" \
-		Makefile.i386linux > Makefile \
-		|| die "sed failed"
+		Makefile.i386linux > Makefile || die
 }
 
 src_compile() {
 	cd "${S}"/tenebrae_0/linux
-	emake MASTER_DIR="${GAMES_DATADIR}/quake1" build_release || die
+	emake MASTER_DIR="${GAMES_DATADIR}/quake1" build_release
 }
 
 src_install() {
-	newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae || die
+	newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae
 	insinto "${GAMES_DATADIR}/quake1/tenebrae"
-	doins "${WORKDIR}"/tenebrae/* || die "doins data"
+	doins "${WORKDIR}"/tenebrae/*
 	dodoc tenebrae_0/linux/README "${WORKDIR}"/Tenebrae_Readme.txt
 	prepgamesdirs
 }
diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
index ae170bc90f7b..6c8cc2e3a780 100644
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
+++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-mud/tintin/tintin-2.01.1.ebuild b/games-mud/tintin/tintin-2.01.1.ebuild
index 5e37153f41c3..e219769a07de 100644
--- a/games-mud/tintin/tintin-2.01.1.ebuild
+++ b/games-mud/tintin/tintin-2.01.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile
index a0453a50f7c4..66e6401df5bb 100644
--- a/games-roguelike/dwarf-fortress/files/Makefile
+++ b/games-roguelike/dwarf-fortress/files/Makefile
@@ -17,7 +17,7 @@ OBJS := $(SRCS:.cpp=.o)
 BLIBS := ncursesw openal sndfile
 LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
 CXXFLAGS ?= -O2 -pipe -Wall -Wextra
-CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11
+CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
 LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
 
 LG := libs/libgraphics.so
diff --git a/games-roguelike/tomenet/tomenet-4.6.0.ebuild b/games-roguelike/tomenet/tomenet-4.6.0.ebuild
index 79d9b8a2dc03..59687676b4ed 100644
--- a/games-roguelike/tomenet/tomenet-4.6.0.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tomenet.eu/downloads/${P}.tar.bz2"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dedicated server +sound X"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index d37f49a2a359..dfe3e3b884a3 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1 +1,2 @@
 DIST freedroidRPG-0.15.1.tar.gz 209427247 SHA256 3e0e0e901f05386f49b8dfa1a8b3582ea82347deb7fb8e94fc15bf8ad058ba08 SHA512 3e38753a040e507229b87235e449fc77db2457a4eb0129f8866a58e3863baa08304feb846828be95183a0b9e46f11761c706571ea68500203c953e1467e108a4 WHIRLPOOL 42f0d6e5ae48437ad0fb00d38966904601de80f2d7dbf6d93d40da5cf4897cc12fc82ec1b9ce500947ed4f1f583eb736fbfc2cdf7619f22999c0e28a007b0aac
+DIST freedroidRPG-0.16.tar.gz 225570013 SHA256 c11f28b69eed3e8e40528442d9e840847502ccd4d3d95d3f8182abc2b3b18135 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a WHIRLPOOL cc8e812515c9f0ce979558c8307fc2f7d30597c198fecd42e43e927b1969b8cacff0db4eed71a41b4119ddb64829d729593ee4151ca69c776f45b9295cda0978
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
new file mode 100644
index 000000000000..bb5d56bbc9fe
--- /dev/null
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils gnome2-utils python-any-r1 games
+
+DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
+HOMEPAGE="http://freedroid.sourceforge.net/"
+SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls opengl sound"
+
+RDEPEND="media-libs/libsdl[opengl?,sound?,video]
+	virtual/jpeg:0
+	media-libs/libpng:0
+	media-libs/sdl-image[jpeg,png]
+	>=media-libs/sdl-gfx-2.0.21
+	sound? (
+		media-libs/sdl-mixer[vorbis]
+		media-libs/libogg
+		media-libs/libvorbis )
+	x11-libs/libX11
+	opengl? ( virtual/opengl )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^dist_doc_DATA/d' \
+		-e '/-pipe/d' \
+		-e '/^SUBDIRS/s/pkgs//' \
+		Makefile.am || die
+	python_fix_shebang src sound
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-fastmath \
+		--with-embedded-lua \
+		--localedir=/usr/share/locale \
+		$(use_enable nls) \
+		$(use_enable opengl) \
+		$(use_enable sound)
+}
+
+src_install() {
+	local i
+
+	default
+	for i in 48 64 96 128
+	do
+		doicon -s ${i} pkgs/freedesktop/icons/hicolor/${i}x${i}/apps/freedroidRPG.png
+	done
+	doicon -s scalable pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg
+	make_desktop_entry freedroidRPG "Freedroid RPG" freedroidRPG
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	echo
+	ewarn "${P} is not compatible with old save games."
+	ewarn "Please start a new character."
+	echo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
new file mode 100644
index 000000000000..4bd9e8fc6f83
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
@@ -0,0 +1,64 @@
+--- JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
++++ JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+@@ -47,14 +47,14 @@
+ 	if (!globalSettings.batch) {
+ 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {
+ 			char output[120];
+-			sprintf(output, SDL_GetError());
++			strcpy(output, SDL_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 		
+ 		if (!globalSettings.disableSound) {
+ 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {
+ 				char error[120];
+-				sprintf(error, SDL_GetError());
++				strcpy(error, SDL_GetError());
+ 				string errorStr = error;
+ 				errorStr += ", continuing without initialising sound.";
+ 				WriteLog(errorStr);
+@@ -81,7 +81,7 @@
+ 		//4096 is rather a large chunksize, should be smaller if I add sound effects
+ 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {
+ 			char output[100];
+-			sprintf(output, Mix_GetError());
++			strcpy(output, Mix_GetError());
+ 			throw runtime_error(output);
+ 		}
+ 	}
+@@ -101,7 +101,7 @@
+ 	if (screen == NULL) {
+ 		SDL_Quit();
+ 		char output[120];
+-		sprintf(output, SDL_GetError());
++		strcpy(output, SDL_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
+@@ -114,7 +114,7 @@
+ 
+ 	if (loadingSurface == NULL) {
+ 		char output[100];
+-		sprintf(output, IMG_GetError());
++		strcpy(output, IMG_GetError());
+ 		throw runtime_error(output);
+ 	}
+ 
+@@ -308,7 +308,7 @@
+ 
+ 	if (!theMusic) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
+@@ -319,7 +319,7 @@
+ 
+ 	if (Mix_PlayMusic(theMusic, -1) == -1) {
+ 		char output[100];
+-		sprintf(output, Mix_GetError());
++		strcpy(output, Mix_GetError());
+ 		throw runtime_error(output);
+ 	}
+ }
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
index 2ad03dad1ec7..f19966e98676 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 galaxyhack"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
@@ -30,6 +30,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-boost.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-boost-1.50.patch \
+		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-gentoo.patch
 	sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
 		Main.cpp || die
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
index 33917bb2dfe3..23aed4cb042d 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.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$
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.38:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
 	>=x11-libs/libXext-1.1
 	>=x11-libs/libXrandr-1.3
 	x11-libs/cairo:=[X]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
index 7fe803500e2f..ada8058e5a1b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.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$
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.44.0:2[dbus]
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
 	>=x11-libs/libXext-1.1
 	>=x11-libs/libXrandr-1.3
 	x11-libs/cairo:=[X]
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
index 3788dcbefbdd..49a6fc0a9223 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
@@ -10,7 +10,7 @@ GNOME_TARBALL_SUFFIX="bz2"
 inherit eutils gnome2 virtualx
 
 DESCRIPTION="User Interface part of libbonobo"
-HOMEPAGE="https://library.gnome.org/devel/libbonoboui/"
+HOMEPAGE="https://developer.gnome.org/libbonoboui/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
diff --git a/gnome-base/libbonoboui/metadata.xml b/gnome-base/libbonoboui/metadata.xml
index da6fd63d0085..7be18f633777 100644
--- a/gnome-base/libbonoboui/metadata.xml
+++ b/gnome-base/libbonoboui/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<longdescription>
+	computer. It will however make a snappier openoffice than the binary  version.
+	The Bonobo UI library provides a number of user interface controls using the 
+	Bonobo component framework.	This module is heading towards planned deprecation.
+	It will continue to be supported and API/ABI stable	throughout the GNOME 2.x 
+	series, but we do not recommend using it in new applications unless you require
+	functionality that has not already been moved elsewhere.
+</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
index 6b2e8bdd1a9f..eed510210ea6 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-VALA_MIN_API_VERSION="0.25"
+PYTHON_COMPAT=( python{3_4,3_5} )
+VALA_MIN_API_VERSION="0.26"
 
 inherit eutils gnome2 multilib python-any-r1 vala
 
@@ -22,45 +22,53 @@ RDEPEND=">=dev-libs/glib-2.32.0:2
 	>=media-libs/gst-plugins-good-1.4.0:1.0
 	>=media-libs/gst-plugins-bad-1.4.0:1.0
 	>=dev-libs/libgee-0.8:0.8
-	>=dev-db/sqlite-3.4
+	>=dev-db/sqlite-3.4:3
 	>=media-libs/gst-rtsp-server-1.4.5:1.0
 	media-plugins/gst-plugins-dvb:1.0
 	dev-python/gst-python:1.0
 	>=dev-python/pygobject-3.2.1:3
-	>=dev-libs/gobject-introspection-1.44.0
+	>=dev-libs/gobject-introspection-1.44.0:0
 	x11-libs/gtk+:3[introspection]
-	virtual/libgudev
+	virtual/libgudev:0
 	vala? ( $(vala_depend) )
 	totem? ( media-video/totem )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=dev-lang/perl-5.8.1
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=sys-devel/libtool-2.2.6"
+	>=dev-lang/perl-5.8.1:0
+	>=dev-util/intltool-0.40.0:0
+	>=dev-libs/libltdl-2.2.6:0
+	virtual/pkgconfig:0
+	nls? ( >=sys-devel/gettext-0.18.1:0 )"
 
 pkg_setup() {
-	G2CONF="${G2CONF} \
-		$(use_enable nls)
-		$(use_enable totem totem-plugin)"
-	use totem && G2CONF="${G2CONF} \
-		--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
 	python-any-r1_pkg_setup
 }
 
 src_prepare() {
 	python_fix_shebang .
 	gnome2_src_prepare
-	use vala && vala_src_prepare
+	if use vala ; then
+		vala_src_prepare
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable totem totem-plugin) \
+		$(usex totem '--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins' '')
 }
 
 pkg_postinst() {
-	use totem && python_optimize
+	if use totem ; then
+		python_optimize
+	fi
 	gnome2_pkg_postinst
 }
 
 pkg_postrm() {
-	use totem && python_optimize
+	if use totem ; then
+		python_optimize
+	fi
 	gnome2_pkg_postrm
 }
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
index 222c199b4a12..9ef9a44a0eee 100644
--- a/gnome-extra/gnome-dvb-daemon/metadata.xml
+++ b/gnome-extra/gnome-dvb-daemon/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<longdescription lang="en">
+	GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your 
+	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
+	by any application via its D-Bus interface.
+</longdescription>
 <use>
 	<flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
 	<flag name="vala">Add support for <pkg>dev-lang/vala</pkg></flag>
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index 37eb36aee31d..23efd49dc939 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1 +1 @@
-DIST gnome-packagekit-3.12.2.tar.xz 4596908 SHA256 a4d5fca6f9481b48202f996c8a3835051c98b6e6df0929394704c3c41e28afb2 SHA512 e1e5cd296e4bc99c13d71805de530be644b4ac3a9bd5580d36ebd880a22292ec91ce9ad28a8ff66f0cb2285a5bc0c80f1b47421c9bbf7b2c9e2c1c17131bc21d WHIRLPOOL 66f23046d3fd262b5a5fbc470d762baaafbb75fb1c9e832f408672b8c399580a1ad2a9e7b03acd81c00c6a486074b224eed4b15d1377354f557823f6282013de
+DIST gnome-packagekit-3.18.0.tar.xz 1789556 SHA256 a0a862f0fd0adec9e4110277c599f57404d4fb655e68448d93fe9c7500e2fc28 SHA512 500c6dfe20a127eab35ccf7447ae18f81ad5c1b34e604b56fc6e4ae0f2b5ad24a7f009da32ffeb010a596d18b8680f8d93f774dc7fe2455546f09b30bda589e8 WHIRLPOOL 39d63d616e63579ac26df40683895e150d3bfb6e12852d59d67984f2fc246364304a295bb8f7a458c96c84c5d03d480d41c2e0ab56b788f63148e86d92bf882a
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.18.0.ebuild
similarity index 77%
rename from gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild
rename to gnome-extra/gnome-packagekit/gnome-packagekit-3.18.0.ebuild
index 7169668a8bcb..7013d51a7354 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.18.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 virtualx
+inherit gnome2 virtualx
 
 DESCRIPTION="PackageKit client for the GNOME desktop"
 HOMEPAGE="http://www.freedesktop.org/software/PackageKit/"
@@ -13,19 +13,18 @@ HOMEPAGE="http://www.freedesktop.org/software/PackageKit/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls systemd test udev"
+IUSE="systemd test udev"
 
 # gdk-pixbuf used in gpk-animated-icon
 # pango used on gpk-common
 RDEPEND="
 	>=dev-libs/glib-2.32:2
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.91.0:3
+	>=x11-libs/gtk+-3.15.3:3
 	>=x11-libs/libnotify-0.7.0:=
 	x11-libs/pango
-	>=dev-libs/dbus-glib-0.73
 
-	>=app-admin/packagekit-base-0.7.2[udev]
+	>=app-admin/packagekit-base-0.8
 	>=app-admin/packagekit-gtk-0.7.2
 	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
@@ -39,6 +38,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
 	dev-libs/libxslt
@@ -48,18 +48,12 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # app-text/docbook-sgml-utils required for man pages
-# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
-# gtk-doc is generating a useless file, don't need it
 
 # UPSTREAM:
 # misuse of CPPFLAGS/CXXFLAGS ?
 # see if tests can forget about display (use eclass for that ?)
-# intltool and gettext only with +nls
 
 src_prepare() {
-	# Regenerate marshalers for <glib-2.31 compat
-	rm -v src/gpk-marshal.{c,h} || die
-
 	# * disable tests with graphical dialogs and that require packagekitd
 	#   to be run with the dummy backend and installed .ui files
 	# * disable tests that fails every time packagekit developers make a
@@ -82,15 +76,12 @@ src_configure() {
 	gnome2_src_configure \
 		--localstatedir=/var \
 		--enable-iso-c \
-		$(use_enable nls) \
 		$(use_enable systemd) \
 		$(use_enable test tests) \
-		$(use_enable udev gudev) \
-		ITSTOOL="$(type -P true)"
+		$(use_enable udev gudev)
 }
 
 src_test() {
-	# FIXME: this should be handled at eclass level
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
 	unset DISPLAY
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
new file mode 100644
index 000000000000..0f691a06cec9
--- /dev/null
+++ b/gnome-extra/gnome-software/Manifest
@@ -0,0 +1 @@
+DIST gnome-software-3.18.3.tar.xz 2195300 SHA256 cc76a51f56d114018f64478437aebef068799802884543c59e2473066c959b7b SHA512 61d4f9622d0f3c6b65d271a79908713f1ee5a2da67275aee6cd6510d6c124ad76300bcc696846d8bd95843f9326534218d3b140445f6e7d2f6ab8d336e476ec0 WHIRLPOOL acea5e54b06bcd2d1088d7790b813001a2718acd981c53f4dca170200efc96ca2d6e477ff674f384e08817821697ef2e2261d4d14cf5f3bd4c757352920231de
diff --git a/gnome-extra/gnome-software/gnome-software-3.18.3.ebuild b/gnome-extra/gnome-software/gnome-software-3.18.3.ebuild
new file mode 100644
index 000000000000..8e0fdb17f450
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.18.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="http://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=app-admin/packagekit-base-1.0.9
+	dev-db/sqlite:3
+	>=dev-libs/appstream-glib-0.5.1:0
+	>=dev-libs/glib-2.45.8:2
+	>=gnome-base/gnome-desktop-3.17.92:3=
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+	net-libs/libsoup:2.4
+	sys-auth/polkit
+	>=x11-libs/gtk+-3.16:3
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+# test? ( dev-util/valgrind )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# valgrind fails with SIGTRAP
+	sed -e 's/TESTS = .*/TESTS =/' \
+		-i "${S}"/src/Makefile.{am,in} || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: investigate limba and firmware update support
+	gnome2_src_configure \
+		--enable-man \
+		--disable-firmware \
+		--disable-limba \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
new file mode 100644
index 000000000000..6e0e2ecb48ca
--- /dev/null
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild b/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild
index d3675d516d6a..0a60c719bcff 100644
--- a/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild
+++ b/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="A tool to generate images and thumbnails from HTML files"
 HOMEPAGE="https://git.gnome.org/browse/gnome-web-photo/"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
new file mode 100644
index 000000000000..221aa1c66d69
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+	reports? ( ${PYTHON_REQUIRED_USE} )
+	canvas? ( gtk )
+	graphviz? ( gtk )
+	sourceview? ( gtk )
+	vala? ( introspection )
+"
+# firebird license is not GPL compatible
+
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline:0=
+	sys-libs/ncurses:0=
+	berkdb? ( sys-libs/db:* )
+	firebird? ( dev-db/firebird )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	json? ( dev-libs/json-glib )
+	ldap? ( net-nds/openldap:= )
+	mdb? ( >app-office/mdbtools-0.5:= )
+	mysql? ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl? ( dev-libs/openssl:= )
+	>=dev-db/sqlite-3.6.22:3=
+	vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+	test
+	firebird? ( bindist )
+"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix compilation with -Werror=format-security (from 'master')
+	epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+	# Support JRE 1.8 (from Fedora)
+	epatch "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	use reports ||
+		sed -e '/SUBDIRS =/ s/trml2html//' \
+			-e '/SUBDIRS =/ s/trml2pdf//' \
+			-i libgda-report/RML/Makefile.{am,in} || die
+
+	# Prevent file collisions with libgda:4
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files (for non-git versions of libgda)
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+	java-pkg-opt-2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myconf=( )
+	if use introspection ; then
+		myconf+=( $(use_enable gtk gdaui-gi) )
+	else:
+		myconf+=( --disable-gdaui-gi )
+	fi
+	if use vala ; then
+		myconf+=( $(use_enable gtk gdaui-vala) )
+	else
+		myconf+=( --disable-gdaui-vala )
+	fi
+
+	gnome2_src_configure \
+		--with-help \
+		--disable-default-binary \
+		--disable-static \
+		--enable-system-sqlite \
+		$(use_with berkdb bdb /usr) \
+		$(use_with canvas goocanvas) \
+		$(use_with firebird firebird /usr) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with graphviz) \
+		$(use_with gtk ui) \
+		$(use_with http libsoup) \
+		$(use_enable introspection) \
+		$(use_enable introspection gda-gi) \
+		"$(use_with java java $JAVA_HOME)" \
+		$(use_enable json) \
+		$(use_with ldap) \
+		$(use_with mdb mdb /usr) \
+		$(use_with mysql mysql /usr) \
+		$(use_with oci8 oracle) \
+		$(use_with postgres postgres /usr) \
+		$(use_enable ssl crypto) \
+		$(use_with sourceview gtksourceview) \
+		$(use_enable vala) \
+		$(use_enable vala vala-extensions) \
+		${myconf[@]}
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+src_install() {
+	gnome2_src_install
+	if use reports; then
+		for t in trml2{html,pdf}; do
+			python_scriptinto /usr/share/libgda-5.0/gda_${t}
+			python_doscript libgda-report/RML/${t}/${t}.py
+		done
+	fi
+}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
new file mode 100644
index 000000000000..6f57138e22ac
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-2.90.3:3[X(+)]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Needed for eautoreconf
+#	>=gnome-base/gnome-common-0.12
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Does not require introspection at all, bug #561008
+	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
+}
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
index 48894d46c6cd..c10f2bb78987 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit gnome.org
 
 DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/PolicyKit"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
index 47aa715a3b5b..02b46f80e884 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.16.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$
 
@@ -36,7 +36,7 @@ RDEPEND="
 	>=dev-db/sqlite-3.7.11:3
 	sys-apps/dbus
 	datahub? ( x11-libs/gtk+:3 )
-	fts? ( dev-libs/xapian[inmemory] )
+	fts? ( dev-libs/xapian:0=[inmemory] )
 	icu? ( dev-libs/dee[icu?] )
 	introspection? ( dev-libs/gobject-introspection )
 	telepathy? ( net-libs/telepathy-glib )
diff --git a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..ae6d9f7cb132
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="A KDE filemanager focusing on usability"
+HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_kdebase_dep kactivities '' 4.13)
+	$(add_kdeapps_dep libkonq)
+	media-libs/phonon[qt4]
+	x11-libs/libXrender
+	semantic-desktop? (
+		$(add_kdebase_dep baloo)
+		$(add_kdeapps_dep baloo-widgets)
+		$(add_kdebase_dep kfilemetadata)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdebase-kioslaves)
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep konsolepart)
+	thumbnail? (
+		$(add_kdeapps_dep thumbnailers)
+		|| (
+			$(add_kdeapps_dep ffmpegthumbs)
+			$(add_kdeapps_dep mplayerthumbs)
+		)
+	)
+"
+
+RESTRICT="test"
+# bug 393129
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Baloo)
+		$(cmake-utils_use_with semantic-desktop BalooWidgets)
+		$(cmake-utils_use_with semantic-desktop KFileMetaData)
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! has_version media-gfx/icoutils ; then
+		elog "For .exe file preview support, install media-gfx/icoutils."
+	fi
+}
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
new file mode 100644
index 000000000000..552c0005e9c5
--- /dev/null
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kde-wallpapers"
+inherit kde4-base
+
+DESCRIPTION="KDE wallpapers"
+KEYWORDS="~amd64 ~x86"
+IUSE="+minimal"
+
+src_configure() {
+	local mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use minimal ; then
+		rm -r "${ED}"usr/share/wallpapers/Autumn || die
+	fi
+}
diff --git a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
similarity index 95%
rename from kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild
rename to kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
index dc2139f367bf..38d17cfa7288 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
@@ -19,7 +19,8 @@ RDEPEND="
 	$(add_kdeapps_dep kfmclient)
 	$(add_kdeapps_dep konq-plugins)
 	$(add_kdeapps_dep konqueror)
-	$(add_kdeapps_dep konsole '' 4.14.3-r1)
+	$(add_kdeapps_dep konsolepart)
+	|| ( $(add_kdeapps_dep konsole '' 4.14.3-r2) kde-apps/konsole:5 )
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
 	$(add_kdeapps_dep nsplugins)
diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
new file mode 100644
index 000000000000..be55c4a353ca
--- /dev/null
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc/manual"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="$(add_kdeapps_dep konsolepart)"
+
+# can't connect to a kded instance, fails to connect to dbus
+RESTRICT="test"
+
+src_prepare() {
+	comment_add_subdirectory data
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibKonq=OFF
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	rm -r "${ED}"usr/$(get_libdir) || die
+	rm -r "${ED}"usr/share/apps || die
+	rm "${ED}"usr/share/kde4/services/konsolepart.desktop || die
+	rm -r "${ED}"usr/share/kde4/servicetypes || die
+}
diff --git a/kde-apps/konsolepart/Manifest b/kde-apps/konsolepart/Manifest
new file mode 100644
index 000000000000..607206c62491
--- /dev/null
+++ b/kde-apps/konsolepart/Manifest
@@ -0,0 +1 @@
+DIST konsole-4.14.3.tar.xz 455216 SHA256 2f750e6930309f8a3b939c7cd30415a08d71da27af10893c3341305db803f155 SHA512 88a919ea7230ae96518a347b80dbf08d641c60557f24cff02421f22cc99da5b2daf306d8e7b820cd701983fcd3ee46171cc97e231591ad2c334574777fbdb135 WHIRLPOOL 588f0f02c8008679ff598d15cd79f8214acd74e57f5c5a936d5aa26d64c1f4f62f46f834ddf6b0545ea05f98d6a2bafcb3b7b5eb9e7c31e93224976b5168bd8e
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
new file mode 100644
index 000000000000..af82f3dec530
--- /dev/null
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="konsole"
+KDE_HANDBOOK="never"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="X terminal kpart for use by konsole and other KDE applications"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug minimal"
+
+COMMONDEPEND="
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libxklavier-3.2
+		x11-libs/libXrender
+		x11-libs/libXtst
+		!minimal? ( $(add_kdeapps_dep libkonq) )
+	)
+"
+DEPEND="${COMMONDEPEND}
+	!aqua? (
+		x11-apps/bdftopcf
+		x11-proto/kbproto
+		x11-proto/renderproto
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	!<kde-apps/konsole-4.14.3-r2
+"
+
+# can't connect to a kded instance, fails to connect to dbus
+RESTRICT="test"
+
+S="${WORKDIR}/${KMNAME}-${PV}"
+
+src_prepare() {
+	comment_add_subdirectory doc/manual
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with "!minimal" LibKonq)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	rm -r "${ED}"usr/bin || die
+	rm -r "${ED}"usr/share/applications || die
+	rm "${ED}"usr/share/kde4/services/ServiceMenus/konsolehere.desktop || die
+	rm "${ED}"usr/share/kde4/services/ServiceMenus/konsolerun.desktop || die
+}
diff --git a/kde-apps/konsolepart/metadata.xml b/kde-apps/konsolepart/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-apps/konsolepart/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-misc/krcstat/krcstat-0.7.6.ebuild b/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
similarity index 84%
rename from kde-misc/krcstat/krcstat-0.7.6.ebuild
rename to kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
index 002e49b78875..0f95b2d38bd8 100644
--- a/kde-misc/krcstat/krcstat-0.7.6.ebuild
+++ b/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
@@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild b/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
similarity index 91%
rename from kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
rename to kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
index 9fa3d550bc2e..85711aab31d5 100644
--- a/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
+++ b/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	$(add_kdeapps_dep libkonq)
 "
 DEPEND="${RDEPEND}"
diff --git a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
similarity index 91%
rename from kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
rename to kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
index 9f4c3b92105b..c6719a092342 100644
--- a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
+++ b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
@@ -19,7 +19,7 @@ SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
diff --git a/kde-plasma/kscreen/kscreen-5.4.3.ebuild b/kde-plasma/kscreen/kscreen-5.4.3.ebuild
index b25ff22aa250..f517f453610c 100644
--- a/kde-plasma/kscreen/kscreen-5.4.3.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.4.3.ebuild
@@ -32,3 +32,6 @@ RDEPEND="${DEPEND}
 	dev-qt/qtgraphicaleffects:5
 	!kde-misc/kscreen
 "
+
+# requires running session
+RESTRICT="test"
diff --git a/kde-plasma/kscreen/kscreen-5.5.0.ebuild b/kde-plasma/kscreen/kscreen-5.5.0.ebuild
index b25ff22aa250..f517f453610c 100644
--- a/kde-plasma/kscreen/kscreen-5.5.0.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.0.ebuild
@@ -32,3 +32,6 @@ RDEPEND="${DEPEND}
 	dev-qt/qtgraphicaleffects:5
 	!kde-misc/kscreen
 "
+
+# requires running session
+RESTRICT="test"
diff --git a/kde-plasma/kscreen/kscreen-5.5.1.ebuild b/kde-plasma/kscreen/kscreen-5.5.1.ebuild
index b25ff22aa250..f517f453610c 100644
--- a/kde-plasma/kscreen/kscreen-5.5.1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.1.ebuild
@@ -32,3 +32,6 @@ RDEPEND="${DEPEND}
 	dev-qt/qtgraphicaleffects:5
 	!kde-misc/kscreen
 "
+
+# requires running session
+RESTRICT="test"
diff --git a/kde-plasma/kscreen/kscreen-5.5.2.ebuild b/kde-plasma/kscreen/kscreen-5.5.2.ebuild
index 6e6cb29b63a7..07a01e69543a 100644
--- a/kde-plasma/kscreen/kscreen-5.5.2.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.2.ebuild
@@ -32,3 +32,6 @@ RDEPEND="${DEPEND}
 	dev-qt/qtgraphicaleffects:5
 	!kde-misc/kscreen
 "
+
+# requires running session
+RESTRICT="test"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0-r1.ebuild
similarity index 73%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0-r1.ebuild
index 6e0b9970b874..e3b472d90c13 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0-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,4 +13,4 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(add_frameworks_dep extra-cmake-modules)"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1-r1.ebuild
similarity index 73%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1-r1.ebuild
index 6e0b9970b874..e3b472d90c13 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1-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,4 +13,4 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(add_frameworks_dep extra-cmake-modules)"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2-r1.ebuild
similarity index 73%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2-r1.ebuild
index e343fbfc6261..912135c07410 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2-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,4 +13,4 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(add_frameworks_dep extra-cmake-modules)"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]"
diff --git a/lxqt-base/lxqt-panel/files/lxqt-panel-0.10.0-autohide.patch b/lxqt-base/lxqt-panel/files/lxqt-panel-0.10.0-autohide.patch
new file mode 100644
index 000000000000..5f2bbdae6f23
--- /dev/null
+++ b/lxqt-base/lxqt-panel/files/lxqt-panel-0.10.0-autohide.patch
@@ -0,0 +1,625 @@
+Patch for autohide issue https://github.com/lxde/lxqt/issues/871
+taken from https://github.com/lxde/lxqt-panel/pull/275
+
+diff --git panel/CMakeLists.txt panel/CMakeLists.txt
+index 4e23b53..a7f8176 100644
+--- panel/CMakeLists.txt
++++ panel/CMakeLists.txt
+@@ -2,6 +2,7 @@ set(PROJECT lxqt-panel)
+ 
+ set(PRIV_HEADERS
+     panelpluginsmodel.h
++    windownotifier.h
+     lxqtpanel.h
+     lxqtpanelapplication.h
+     lxqtpanellayout.h
+@@ -26,6 +27,7 @@ set(PUB_HEADERS
+ set(SOURCES
+     main.cpp
+     panelpluginsmodel.cpp
++    windownotifier.cpp
+     lxqtpanel.cpp
+     lxqtpanelapplication.cpp
+     lxqtpanellayout.cpp
+diff --git panel/ilxqtpanel.h panel/ilxqtpanel.h
+index e7b2844..71e4990 100644
+--- panel/ilxqtpanel.h
++++ panel/ilxqtpanel.h
+@@ -32,6 +32,7 @@
+ #include "lxqtpanelglobals.h"
+ 
+ class ILXQtPanelPlugin;
++class QWidget;
+ 
+ /**
+  **/
+@@ -74,6 +75,17 @@ public:
+      **/
+     virtual QRect calculatePopupWindowPos(const QPoint &absolutePos, const QSize &windowSize) const = 0;
+     virtual QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const = 0;
++
++    /*!
++     * \brief By calling this function plugin (or any other object) notifies the panel
++     * about showing a (standalone) window/menu -> panel needs this to avoid "hiding" in case any
++     * standalone window is shown. The widget must be shown later than this notification call because
++     * panel need to observe it's show/hide/close events.
++     *
++     * \param w the shown window
++     *
++     */
++    virtual void willShowWindow(QWidget * w) = 0;
+ };
+ 
+ #endif // ILXQTPANEL_H
+diff --git panel/ilxqtpanelplugin.h panel/ilxqtpanelplugin.h
+index 1503923..3a09def 100644
+--- panel/ilxqtpanelplugin.h
++++ panel/ilxqtpanelplugin.h
+@@ -186,6 +186,16 @@ public:
+         return mPanel->calculatePopupWindowPos(this, windowSize);
+     }
+ 
++    /*!
++     * \brief By calling this function plugin notifies the panel about showing a (standalone) window/menu.
++     *
++     * \param w the shown window
++     *
++     */
++    inline void willShowWindow(QWidget * w)
++    {
++        mPanel->willShowWindow(w);
++    }
+ 
+     virtual bool isSeparate() const { return false;  }
+     virtual bool isExpandable() const { return false; }
+diff --git panel/lxqtpanel.cpp panel/lxqtpanel.cpp
+index 5159c15..d6b70ca 100644
+--- panel/lxqtpanel.cpp
++++ panel/lxqtpanel.cpp
+@@ -35,6 +35,7 @@
+ #include "popupmenu.h"
+ #include "plugin.h"
+ #include "panelpluginsmodel.h"
++#include "windownotifier.h"
+ #include <LXQt/PluginInfo>
+ 
+ #include <QScreen>
+@@ -116,6 +117,7 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg
+     mSettings(settings),
+     mConfigGroup(configGroup),
+     mPlugins{nullptr},
++    mStandaloneWindows{new WindowNotifier},
+     mPanelSize(0),
+     mIconSize(0),
+     mLineCount(0),
+@@ -175,6 +177,9 @@ LXQtPanel::LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidg
+     connect(LXQt::Settings::globalSettings(), SIGNAL(settingsChanged()), this, SLOT(update()));
+     connect(lxqtApp, SIGNAL(themeChanged()), this, SLOT(realign()));
+ 
++    connect(mStandaloneWindows.data(), &WindowNotifier::firstShown, this, &LXQtPanel::showPanel);
++    connect(mStandaloneWindows.data(), &WindowNotifier::lastHidden, this, &LXQtPanel::hidePanel);
++
+     readSettings();
+     // the old position might be on a visible screen
+     ensureVisible();
+@@ -589,6 +594,7 @@ void LXQtPanel::showConfigDialog()
+         mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
+ 
+     mConfigDialog->showConfigPanelPage();
++    mStandaloneWindows->observeWindow(mConfigDialog.data());
+     mConfigDialog->show();
+     mConfigDialog->raise();
+     mConfigDialog->activateWindow();
+@@ -608,6 +614,7 @@ void LXQtPanel::showAddPluginDialog()
+         mConfigDialog = new ConfigPanelDialog(this, nullptr /*make it top level window*/);
+ 
+     mConfigDialog->showConfigPluginsPage();
++    mStandaloneWindows->observeWindow(mConfigDialog.data());
+     mConfigDialog->show();
+     mConfigDialog->raise();
+     mConfigDialog->activateWindow();
+@@ -967,6 +974,7 @@ void LXQtPanel::showPopupMenu(Plugin *plugin)
+      * of QDesktopWidget::availableGeometry)
+      */
+     menu->setGeometry(calculatePopupWindowPos(QCursor::pos(), menu->sizeHint()));
++    willShowWindow(menu);
+     menu->show();
+ }
+ 
+@@ -1043,6 +1051,14 @@ QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const Q
+ /************************************************
+ 
+  ************************************************/
++void LXQtPanel::willShowWindow(QWidget * w)
++{
++    mStandaloneWindows->observeWindow(w);
++}
++
++/************************************************
++
++ ************************************************/
+ QString LXQtPanel::qssPosition() const
+ {
+     return positionToStr(position());
+@@ -1107,20 +1123,17 @@ void LXQtPanel::showPanel()
+ 
+ void LXQtPanel::hidePanel()
+ {
+-    if (mHidable && !mHidden)
++    if (mHidable && !mHidden
++            && !geometry().contains(QCursor::pos())
++            && !mStandaloneWindows->isAnyWindowShown()
++       )
+         mHideTimer.start();
+ }
+ 
+ void LXQtPanel::hidePanelWork()
+ {
+-    if (mHidable && !mHidden && !geometry().contains(QCursor::pos()))
+-    {
+-        mHidden = true;
+-        setPanelGeometry();
+-    } else
+-    {
+-        mHideTimer.start();
+-    }
++    mHidden = true;
++    setPanelGeometry();
+ }
+ 
+ void LXQtPanel::setHidable(bool hidable, bool save)
+@@ -1128,7 +1141,7 @@ void LXQtPanel::setHidable(bool hidable, bool save)
+     if (mHidable == hidable)
+         return;
+ 
+-    mHidable = mHidden = hidable;
++    mHidable = hidable;
+ 
+     if (save)
+         saveSettings(true);
+diff --git panel/lxqtpanel.h panel/lxqtpanel.h
+index 8ff4b8c..990063f 100644
+--- panel/lxqtpanel.h
++++ panel/lxqtpanel.h
+@@ -48,6 +48,7 @@ class PluginInfo;
+ class LXQtPanelLayout;
+ class ConfigPanelDialog;
+ class PanelPluginsModel;
++class WindowNotifier;
+ 
+ /*! \brief The LXQtPanel class provides a single lxqt-panel.
+  */
+@@ -80,11 +81,12 @@ public:
+     void showPopupMenu(Plugin *plugin = 0);
+ 
+     // ILXQtPanel .........................
+-    ILXQtPanel::Position position() const { return mPosition; }
+-    QRect globalGometry() const;
++    ILXQtPanel::Position position() const override { return mPosition; }
++    QRect globalGometry() const override;
+     Plugin *findPlugin(const ILXQtPanelPlugin *iPlugin) const;
+-    QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const;
+-    QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const;
++    QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const override;
++    QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override;
++    void willShowWindow(QWidget * w) override;
+ 
+     // For QSS properties ..................
+     QString qssPosition() const;
+@@ -95,8 +97,8 @@ public:
+ 
+     // Settings
+     int panelSize() const { return mPanelSize; }
+-    int iconSize() const { return mIconSize; }
+-    int lineCount() const { return mLineCount; }
++    int iconSize() const override { return mIconSize; }
++    int lineCount() const override { return mLineCount; }
+     int length() const { return mLength; }
+     bool lengthInPercents() const { return mLengthInPercents; }
+     LXQtPanel::Alignment alignment() const { return mAlignment; }
+@@ -138,8 +140,8 @@ signals:
+     void pluginRemoved();
+ 
+ protected:
+-    bool event(QEvent *event);
+-    void showEvent(QShowEvent *event);
++    bool event(QEvent *event) override;
++    void showEvent(QShowEvent *event) override;
+ 
+ public slots:
+     void showConfigDialog();
+@@ -156,6 +158,7 @@ private:
+     QFrame *LXQtPanelWidget;
+     QString mConfigGroup;
+     QScopedPointer<PanelPluginsModel> mPlugins;
++    QScopedPointer<WindowNotifier> mStandaloneWindows; //!< object for storing info if some standalone window is shown (for preventing hide)
+ 
+     int findAvailableScreen(LXQtPanel::Position position);
+     void updateWmStrut();
+diff --git panel/plugin.cpp panel/plugin.cpp
+index a4acc78..be23a8e 100644
+--- panel/plugin.cpp
++++ panel/plugin.cpp
+@@ -477,6 +477,7 @@ void Plugin::showConfigureDialog()
+     if (!dialog)
+         return;
+ 
++    mPanel->willShowWindow(dialog);
+     dialog->show();
+     dialog->raise();
+     dialog->activateWindow();
+diff --git panel/windownotifier.cpp panel/windownotifier.cpp
+new file mode 100644
+index 0000000..0b41057
+--- /dev/null
++++ panel/windownotifier.cpp
+@@ -0,0 +1,65 @@
++/* BEGIN_COMMON_COPYRIGHT_HEADER
++ * (c)LGPL2+
++ *
++ * LXQt - a lightweight, Qt based, desktop toolset
++ * http://lxqt.org
++ *
++ * Copyright: 2015 LXQt team
++ * Authors:
++ *   Palo Kisa <palo.kisa@gmail.com>
++ *
++ * This program or library is free software; you can redistribute it
++ * and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++
++ * You should have received a copy of the GNU Lesser General
++ * Public License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
++ *
++ * END_COMMON_COPYRIGHT_HEADER */
++
++#include "windownotifier.h"
++#include <QWidget>
++#include <QEvent>
++
++void WindowNotifier::observeWindow(QWidget * w)
++{
++    //installing the same filter object multiple times doesn't harm
++    w->installEventFilter(this);
++}
++
++
++bool WindowNotifier::eventFilter(QObject * watched, QEvent * event)
++{
++    QWidget * widget = qobject_cast<QWidget *>(watched); //we're observing only QWidgetw
++    auto it = std::lower_bound(mShownWindows.begin(), mShownWindows.end(), widget);
++    switch (event->type())
++    {
++        case QEvent::Close:
++            watched->removeEventFilter(this);
++            //no break
++        case QEvent::Hide:
++            Q_ASSERT(mShownWindows.end() != it);
++            mShownWindows.erase(it);
++            if (mShownWindows.isEmpty())
++                emit lastHidden();
++            break;
++        case QEvent::Show:
++            {
++                const bool first_shown = mShownWindows.isEmpty();
++                mShownWindows.insert(it, widget); //we keep the mShownWindows sorted
++                if (first_shown)
++                    emit firstShown();
++            }
++        default:
++            break;
++    }
++    return false;
++}
+diff --git panel/windownotifier.h panel/windownotifier.h
+new file mode 100644
+index 0000000..53f2f3f
+--- /dev/null
++++ panel/windownotifier.h
+@@ -0,0 +1,53 @@
++/* BEGIN_COMMON_COPYRIGHT_HEADER
++ * (c)LGPL2+
++ *
++ * LXQt - a lightweight, Qt based, desktop toolset
++ * http://lxqt.org
++ *
++ * Copyright: 2015 LXQt team
++ * Authors:
++ *   Palo Kisa <palo.kisa@gmail.com>
++ *
++ * This program or library is free software; you can redistribute it
++ * and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++
++ * You should have received a copy of the GNU Lesser General
++ * Public License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
++ *
++ * END_COMMON_COPYRIGHT_HEADER */
++
++#if !defined(WINDOWNOTIFIER_H)
++#define WINDOWNOTIFIER_H
++
++#include <QObject>
++
++class QWidget;
++
++class WindowNotifier : public QObject
++{
++    Q_OBJECT
++public:
++    using QObject::QObject;
++
++    void observeWindow(QWidget * w);
++    inline bool isAnyWindowShown() const { return !mShownWindows.isEmpty(); }
++
++    virtual bool eventFilter(QObject * watched, QEvent * event) override;
++signals:
++    void lastHidden();
++    void firstShown();
++
++private:
++    QList<QWidget *> mShownWindows; //!< known shown windows (sorted)
++};
++
++#endif
+diff --git plugin-clock/lxqtclock.cpp plugin-clock/lxqtclock.cpp
+index 79c2c17..d4603de 100644
+--- plugin-clock/lxqtclock.cpp
++++ plugin-clock/lxqtclock.cpp
+@@ -286,6 +286,7 @@ void LXQtClock::activated(ActivationReason reason)
+     {
+         QRect pos = calculatePopupWindowPos(mCalendarPopup->size());
+         mCalendarPopup->move(pos.topLeft());
++        willShowWindow(mCalendarPopup);
+         mCalendarPopup->show();
+     }
+     else
+diff --git plugin-directorymenu/directorymenu.cpp plugin-directorymenu/directorymenu.cpp
+index 8c5ec28..e332e05 100644
+--- plugin-directorymenu/directorymenu.cpp
++++ plugin-directorymenu/directorymenu.cpp
+@@ -58,11 +58,11 @@ DirectoryMenu::DirectoryMenu(const ILXQtPanelPluginStartupInfo &startupInfo) :
+ 
+ DirectoryMenu::~DirectoryMenu()
+ {
+-	if(mMenu)
+-	{
+-		delete mMenu;
+-		mMenu = 0;
+-	}
++    if(mMenu)
++    {
++        delete mMenu;
++        mMenu = 0;
++    }
+ }
+ 
+ void DirectoryMenu::showMenu()
+@@ -102,67 +102,67 @@ void DirectoryMenu::showMenu()
+             break;
+     }
+ 
++    willShowWindow(mMenu);
+     // Just using Qt`s activateWindow() won't work on some WMs like Kwin.
+     // Solution is to execute menu 1ms later using timer
+-    mButton.activateWindow();
+-    mMenu->exec(QPoint(x, y));
++    mMenu->popup(calculatePopupWindowPos(mMenu->sizeHint()).topLeft());
+ }
+ 
+ void DirectoryMenu::buildMenu(const QString& path)
+ {
+-	if(mMenu)
+-	{
+-		delete mMenu;
+-		mMenu = 0;
+-	}
++    if(mMenu)
++    {
++        delete mMenu;
++        mMenu = 0;
++    }
+ 
+-	mPathStrings.clear();
++    mPathStrings.clear();
+ 
+-	mMenu = new QMenu();
++    mMenu = new QMenu();
+ 
+-	addActions(mMenu, path);
++    addActions(mMenu, path);
+ }
+ 
+ void DirectoryMenu::openDirectory(const QString& path)
+ {
+-	QDesktopServices::openUrl(QUrl("file://" + QDir::toNativeSeparators(path)));
++    QDesktopServices::openUrl(QUrl("file://" + QDir::toNativeSeparators(path)));
+ }
+ 
+ void DirectoryMenu::addMenu(QString path)
+ {
+-	QSignalMapper* sender = (QSignalMapper* )QObject::sender();
+-	QMenu* parentMenu = (QMenu*) sender->mapping(path);
++    QSignalMapper* sender = (QSignalMapper* )QObject::sender();
++    QMenu* parentMenu = (QMenu*) sender->mapping(path);
+ 
+-	if(parentMenu->isEmpty())
+-	{
+-		addActions(parentMenu, path);
+-	}
++    if(parentMenu->isEmpty())
++    {
++        addActions(parentMenu, path);
++    }
+ }
+ 
+ void DirectoryMenu::addActions(QMenu* menu, const QString& path)
+ {
+-	mPathStrings.push_back(path);
++    mPathStrings.push_back(path);
+ 
+-	QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open"));
+-	connect(openDirectoryAction, SIGNAL(triggered()), mOpenDirectorySignalMapper, SLOT(map()));
+-	mOpenDirectorySignalMapper->setMapping(openDirectoryAction, mPathStrings.back());
++    QAction* openDirectoryAction = menu->addAction(XdgIcon::fromTheme("folder"), tr("Open"));
++    connect(openDirectoryAction, SIGNAL(triggered()), mOpenDirectorySignalMapper, SLOT(map()));
++    mOpenDirectorySignalMapper->setMapping(openDirectoryAction, mPathStrings.back());
+ 
+-	menu->addSeparator();
++    menu->addSeparator();
+ 
+-	QDir dir(path);
+-	QFileInfoList list = dir.entryInfoList();
++    QDir dir(path);
++    QFileInfoList list = dir.entryInfoList();
+ 
+-	foreach (const QFileInfo& entry, list)
++    foreach (const QFileInfo& entry, list)
+     {
+-    	if(entry.isDir() && !entry.isHidden())
+-    	{
+-			mPathStrings.push_back(entry.fileName());
++        if(entry.isDir() && !entry.isHidden())
++        {
++            mPathStrings.push_back(entry.fileName());
+ 
+-			QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme("folder"), mPathStrings.back());
++            QMenu* subMenu = menu->addMenu(XdgIcon::fromTheme("folder"), mPathStrings.back());
+ 
+-    		connect(subMenu, SIGNAL(aboutToShow()), mMenuSignalMapper, SLOT(map()));
+-    		mMenuSignalMapper->setMapping(subMenu, entry.absoluteFilePath());
+-    	}
++            connect(subMenu, SIGNAL(aboutToShow()), mMenuSignalMapper, SLOT(map()));
++            mMenuSignalMapper->setMapping(subMenu, entry.absoluteFilePath());
++        }
+     }
+ }
+ 
+diff --git plugin-dom/domplugin.cpp plugin-dom/domplugin.cpp
+index ffd05c6..0988a2b 100644
+--- plugin-dom/domplugin.cpp
++++ plugin-dom/domplugin.cpp
+@@ -51,6 +51,7 @@ void DomPlugin::showDialog()
+         dialog->setAttribute(Qt::WA_DeleteOnClose);
+     }
+ 
++    willShowWindow(dialog);
+     dialog->show();
+     dialog->activateWindow();
+ }
+diff --git plugin-mainmenu/lxqtmainmenu.cpp plugin-mainmenu/lxqtmainmenu.cpp
+index 9673a4f..b9ff6e4 100644
+--- plugin-mainmenu/lxqtmainmenu.cpp
++++ plugin-mainmenu/lxqtmainmenu.cpp
+@@ -130,6 +130,7 @@ void LXQtMainMenu::showMenu()
+     if (!mMenu)
+         return;
+ 
++    willShowWindow(mMenu);
+     // Just using Qt`s activateWindow() won't work on some WMs like Kwin.
+     // Solution is to execute menu 1ms later using timer
+     mMenu->popup(calculatePopupWindowPos(mMenu->sizeHint()).topLeft());
+@@ -227,8 +228,6 @@ void LXQtMainMenu::buildMenu()
+     menu->installEventFilter(this);
+     connect(menu, &QMenu::aboutToHide, &mHideTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
+     connect(menu, &QMenu::aboutToShow, &mHideTimer, &QTimer::stop);
+-    // panel notification (needed in case of auto-hide)
+-    connect(menu, &QMenu::aboutToHide, dynamic_cast<LXQtPanel *>(panel()), &LXQtPanel::hidePanel);
+ 
+     QMenu *oldMenu = mMenu;
+     mMenu = menu;
+diff --git plugin-mount/popup.cpp plugin-mount/popup.cpp
+index 1c3e7c1..7993681 100644
+--- plugin-mount/popup.cpp
++++ plugin-mount/popup.cpp
+@@ -90,7 +90,12 @@ Popup::Popup(ILXQtPanelPlugin * plugin, QWidget* parent):
+ 
+ void Popup::showHide()
+ {
+-    setVisible(isHidden());
++    if (isHidden())
++    {
++        mPlugin->willShowWindow(this);
++        show();
++    } else
++        close();
+ }
+ 
+ void Popup::onDeviceAdded(QString const & udi)
+diff --git plugin-statusnotifier/statusnotifierbutton.cpp plugin-statusnotifier/statusnotifierbutton.cpp
+index fb124c6..71cf78f 100644
+--- plugin-statusnotifier/statusnotifierbutton.cpp
++++ plugin-statusnotifier/statusnotifierbutton.cpp
+@@ -249,8 +249,10 @@ void StatusNotifierButton::mouseReleaseEvent(QMouseEvent *event)
+     else if (Qt::RightButton == event->button())
+     {
+         if (mMenu)
+-            mMenu->popup(QCursor::pos());
+-        else
++        {
++            mPlugin->willShowWindow(mMenu);
++            mMenu->popup(mPlugin->calculatePopupWindowPos(mMenu->sizeHint()).topLeft());
++        } else
+             interface->ContextMenu(QCursor::pos().x(), QCursor::pos().y());
+     }
+ 
+diff --git plugin-taskbar/lxqttaskgroup.cpp plugin-taskbar/lxqttaskgroup.cpp
+index 6828216..79e27f5 100644
+--- plugin-taskbar/lxqttaskgroup.cpp
++++ plugin-taskbar/lxqttaskgroup.cpp
+@@ -84,6 +84,7 @@ void LXQtTaskGroup::contextMenuEvent(QContextMenuEvent *event)
+         mPreventPopup = false;
+     });
+     menu->setGeometry(mPlugin->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint()));
++    mPlugin->willShowWindow(menu);
+     menu->show();
+ }
+ 
+@@ -418,6 +419,7 @@ void LXQtTaskGroup::setPopupVisible(bool visible, bool fast)
+             recalculateFramePosition();
+         }
+ 
++        mPlugin->willShowWindow(mPopup);
+         mPopup->show();
+         emit popupShown(this);
+     }
+diff --git plugin-volume/volumebutton.cpp plugin-volume/volumebutton.cpp
+index a738a1a..98b3f10 100644
+--- plugin-volume/volumebutton.cpp
++++ plugin-volume/volumebutton.cpp
+@@ -133,6 +133,7 @@ void VolumeButton::showVolumeSlider()
+     m_volumePopup->updateGeometry();
+     m_volumePopup->adjustSize();
+     QRect pos = mPlugin->calculatePopupWindowPos(m_volumePopup->size());
++    mPlugin->willShowWindow(m_volumePopup);
+     m_volumePopup->openAt(pos.topLeft(), Qt::TopLeftCorner);
+     m_volumePopup->activateWindow();
+ }
+diff --git plugin-worldclock/lxqtworldclock.cpp plugin-worldclock/lxqtworldclock.cpp
+index 7386049..8fa795d 100644
+--- plugin-worldclock/lxqtworldclock.cpp
++++ plugin-worldclock/lxqtworldclock.cpp
+@@ -356,6 +356,7 @@ void LXQtWorldClock::activated(ActivationReason reason)
+         mPopup->adjustSize();
+         mPopup->setGeometry(calculatePopupWindowPos(mPopup->size()));
+ 
++        willShowWindow(mPopup);
+         mPopup->show();
+     }
+     else
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..3c8e096fd81c
--- /dev/null
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.10.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="LXQt desktop panel and plugins"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
+	+mount networkmonitor pulseaudio +quicklaunch screensaver sensors
+	+showdesktop statusnotifier sysstat +taskbar +tray +volume worldclock"
+REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libqtxdg-1.0.0
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	kde-frameworks/kguiaddons:5
+	kde-frameworks/kwindowsystem:5[X]
+	>=lxde-base/menu-cache-0.3.3
+	~lxqt-base/liblxqt-${PV}
+	~lxqt-base/lxqt-globalkeys-${PV}
+	x11-libs/libX11
+	cpuload? ( sys-libs/libstatgrab )
+	kbindicator? ( x11-libs/libxkbcommon )
+	mount? ( kde-frameworks/solid:5 )
+	networkmonitor? ( sys-libs/libstatgrab )
+	sensors? ( sys-apps/lm_sensors )
+	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] )
+	sysstat? ( =lxqt-base/libsysstat-0.3* )
+	tray? ( x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender )
+	volume? ( alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio ) )"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+	>=lxde-base/lxmenu-data-0.1.2"
+
+PATCHES=( "${FILESDIR}/${P}-autohide.patch" )
+
+src_configure() {
+	local mycmakeargs i y
+	for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \
+		networkmonitor quicklaunch screensaver sensors showdesktop statusnotifier \
+		sysstat taskbar tray volume worldclock; do
+		#Switch to ^^ when we switch to EAPI=6.
+		#y=${i^^}
+		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
+		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
+	done
+
+	if use volume; then
+		mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA)
+			$(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install(){
+	cmake-utils_src_install
+	doman panel/man/*.1
+}
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 55c4496826eb..ea64befd1d0b 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1 +1,2 @@
 DIST alot-0.3.6.tar.gz 1492278 SHA256 b8e6092f18e503a528e934231c448db0e03d00e11d844192ba7eeb483838fee7 SHA512 30037ca1d2c169dda6c1660a24dadee12c6b5858d733ec7cd78e49d633850eecb763852c16565340596e32a6831ff8c36764d3f812de7f7947584defe05322b4 WHIRLPOOL cd4aab9dd84a441b92f5d4c62c783d58d8c4fafca614bf8bf462c1b3f0ffb4266e083380712b16f9469a0b418af1672625a21a6ae1f82f6623c6c22e005be6e9
+DIST alot-0.3.7.tar.gz 1475759 SHA256 fe281f6b5fbfcd371a1810c8f59084e8cbc3f69068269e3f787adb1df6f977b5 SHA512 a0b7e5a7b77f8cdee38c273eec2822bee2e7c409ab4b8803817a49d679dd53ff29750ba7f8a9214368cc7b0b17bd76a40b0263b4701b2ef695c7669316b1b116 WHIRLPOOL 3c37a037fc5543ff569f6a5364302462f71f5599c14d17661707cd4beb0e2a8597098dd4f4a42aec27793ace7095bba4eb80c35ed5fd8e470f6b7b9dbbecc46e
diff --git a/mail-client/alot/alot-0.3.7-r1.ebuild b/mail-client/alot/alot-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..1b339c27b98f
--- /dev/null
+++ b/mail-client/alot/alot-0.3.7-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+SRC_URI="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	>=dev-python/configobj-4.6.0[${PYTHON_USEDEP}]
+	dev-python/pygpgme[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-10.2.0
+	>=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	>=net-mail/notmuch-0.13[crypt,python]
+	"
+
+ALOT_UPDATE=""
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-0.3.2"; then
+		ALOT_UPDATE="yes"
+	fi
+}
+
+src_prepare() {
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
+		-e '1i# -*- coding: utf-8 -*-' -i || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}"
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		pushd docs || die
+		emake html
+		popd || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodir /usr/share/alot
+	insinto /usr/share/alot
+	doins -r extra
+
+	if use doc; then
+		dohtml -r docs/build/html/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ALOT_UPDATE} = yes ]]; then
+		ewarn "The syntax of theme-files and custom tags-sections of the config"
+		ewarn "has been changed.  You have to revise your config.  There are"
+		ewarn "converter scripts in /usr/share/alot/extra to help you out with"
+		ewarn "this:"
+		ewarn ""
+		ewarn "  * tagsections_convert.py for your ~/.config/alot/config"
+		ewarn "  * theme_convert.py to update your custom theme files"
+	fi
+}
diff --git a/media-gfx/dispcalgui/Manifest b/media-gfx/dispcalgui/Manifest
index 7edb7563f484..e38d41186b04 100644
--- a/media-gfx/dispcalgui/Manifest
+++ b/media-gfx/dispcalgui/Manifest
@@ -2,3 +2,4 @@ DIST dispcalGUI-1.2.7.0.tar.gz 3302318 SHA256 8032b71ced4d7f718f8aa50a5dfc925951
 DIST dispcalGUI-2.0.0.0.tar.gz 5914050 SHA256 fad516999bd663cf870fad2869fc63a23f93820dffff9dbd1029369417a6b650 SHA512 14e1a5d921ed4aaa07bd96d2c4256ce080bc6201d7a5b2a6fa69ae9ac25b8d34c9b0f3b3dac3d2e9a7d4c5faa97682e10a4b15205098a454623ecdb4e09eb8a5 WHIRLPOOL 1c88bb5da2dcddc1848249ba76057e1e33480e8fc344af6c3348d933c9752cc09f91a03a61f18f71cae27473956ae0e518b85864b5a2eb6ce9caf074d59f167c
 DIST dispcalGUI-2.5.0.0.tar.gz 6392054 SHA256 036a01a11551d990a6b84e241d131ca0b07d810d552b28332907aa6fb3cd4777 SHA512 d5cb2263739f9c46676222d20e570c161897af58bb359ed569a7690b6fc1ed83ce7e9862e7d69b1afb599b8035ca4f4abfccef83b877d98a34956535d2dd729b WHIRLPOOL 725de21d2d320ec74b6a7840cf5f251885b62946e20cfc7bed480f663c77116c9bac61b2df7e7ddfe7a0e7557269d864f0b88569e52463499eb310279fe66b7d
 DIST dispcalGUI-2.6.0.0.tar.gz 6722168 SHA256 3087facf1fd7941b04df327903eb9a49511987a9b7afaada9ee8ca4600d0109f SHA512 0f7b1952588ee8e5c49f3ce3be41e53c0dd746b6fd660107e78ec16b392ebda9f8bc45550a119371b2197fd370f0e28e05aee47c71e26cfb8f648a6d66277454 WHIRLPOOL 84f050ed73200054b7dad53730a86490e44e751ab96ef4ef3faea279ac692ef76685c8992135085c43c3e258e2fc44c5a276217443adc67560eb23b376d535d7
+DIST dispcalGUI-3.0.6.0.tar.gz 9048298 SHA256 6432d47734ad18abccd4ef236eb7b721d7233529057da507fa36ccaf80de6d6a SHA512 cd91960b5ef00bb9f4e60000cc9117ffd6c8236e8b8dc65a76a4690da1c17eb5216385fbc1467ea842119fdbdc2d6937990b07ac999d193a0353249be8b8d795 WHIRLPOOL 629db4a3c293c93918b665b28246d047e1defcbafd82f96a8c662aabf4077b33a1492e37e9e1a5cbbe018b92048a98fcfa872057acad30df1d1a915222428a02
diff --git a/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild b/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild
new file mode 100644
index 000000000000..854a19bea0a5
--- /dev/null
+++ b/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 fdo-mime eutils
+
+MY_PN="dispcalGUI"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS"
+HOMEPAGE="https://dispcalgui.hoech.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:2.8
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-proto/xineramaproto-1.2
+	>=x11-libs/libXinerama-1.1"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1"
+
+# Just in case someone renames the ebuild
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	README.html
+)
+
+src_prepare() {
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	cd "${S}/dispcalGUI" || die "Cannot cd to source directory."
+	sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
+		-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
+		-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
+
+	# Remove deprecated Encoding key from .desktop file
+	cd "${S}" || die "Cannot cd to work directory."
+	for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
+		sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
+		die "removing deprecated Encoding key from .desktop files failed"
+	done
+
+	# Remove x-world Media Type
+	cd "${S}/misc" || die "Cannot cd to misc directory."
+	sed -e 's/x\-world\/x\-vrml\;//g' -i "dispcalGUI-VRML-to-X3D-converter.desktop" \
+		|| die "removing x-world media type failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	#remove udev files
+	rm -rf "${D}"/etc/udev/rules.d
+}
+
+pkg_postinst() {
+	# Run xdg-* programs the Gentoo way since we removed this
+	# functionality from the original package
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Run xdg-* programs the Gentoo way since we removed this
+	# functionality from the original package
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/dispcalgui/metadata.xml
index 3a8ed7223da0..8d4a696bdca9 100644
--- a/media-gfx/dispcalgui/metadata.xml
+++ b/media-gfx/dispcalgui/metadata.xml
@@ -3,14 +3,9 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>opensource@andmarios.com</email>
-    <name>Marios Andreopoulos</name>
-    <description>Maintainer.</description>
-  </maintainer>
-  <maintainer>
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-    <description>Proxy maintainer.</description>
+    <email>gentoo@xayto.net</email>
+    <name>Craig Inches</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
   </maintainer>
   <longdescription lang="en">
 </longdescription>
diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
new file mode 100644
index 000000000000..99bc10d9b57f
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
@@ -0,0 +1,12 @@
+--- a/src/bar_keywords.c	2015-05-23 14:20:43.000000000 +0200
++++ b/src/bar_keywords.c	2015-12-30 00:34:21.453531792 +0100
+@@ -1295,6 +1295,9 @@
+ 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
+ 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
+ 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
++#if GTK_CHECK_VERSION(3,0,0)
++	gtk_widget_set_size_request(pkd->widget, -1, 400);
++#endif
+ 	gtk_widget_show(hbox);
+ 
+ 	scrolled = gtk_scrolled_window_new(NULL, NULL);
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..91b99a33bfa0
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# clutter does not compile, gps depends on clutter
+	local myconf="--disable-dependency-tracking
+		--with-readmedir=/usr/share/doc/${PF}
+		--disable-clutter
+		--disable-gps
+		$(use_enable debug debug-log)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README
+}
+
+pkg_postinst() {
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0cc148166190..2f64355b4468 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1 +1,2 @@
 DIST SDL2-2.0.3.tar.gz 3871267 SHA256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540 WHIRLPOOL d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
+DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
new file mode 100644
index 000000000000..bee2fd580aaa
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
@@ -0,0 +1,89 @@
+--- SDL2-2.0.4.orig/configure.in
++++ SDL2-2.0.4/configure.in
+@@ -3114,7 +3114,7 @@
+         if test -f /lib/w32api/libuuid.a; then
+             LIBUUID=/lib/w32api/libuuid.a
+         else
+-            LIBUUID=-luuid
++            LIBUUID=-Wl,-luuid
+         fi
+         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
+         # The Windows platform requires special setup
+@@ -3464,23 +3464,23 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+-	\\$(WINDRES) \\$< \\$@,g"`
++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
++	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\
+ 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
+ SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
+-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\
+ 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ # Set runtime shared library paths as needed
+--- SDL2-2.0.4.orig/Makefile.in
++++ SDL2-2.0.4/Makefile.in
+@@ -33,10 +33,10 @@
+ OBJECTS = @OBJECTS@
+ VERSION_OBJECTS = @VERSION_OBJECTS@
+ 
+-SDLMAIN_TARGET = libSDL2main.a
++SDLMAIN_TARGET = libSDL2main.la
+ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
+ 
+-SDLTEST_TARGET = libSDL2_test.a
++SDLTEST_TARGET = libSDL2_test.la
+ SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
+ 
+ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
+@@ -138,15 +138,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_RANLIB)$(RANLIB) $@
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_RANLIB)$(RANLIB) $@
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:
+@@ -167,10 +165,8 @@
+ install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+-	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+-	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+ install-data:
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
+ 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
new file mode 100644
index 000000000000..19c1d5c4bb23
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: convert FusionSound #484250
+
+EAPI=5
+inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
+
+MY_P=SDL2-${PV}
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fusionsound? ( sound )
+	gles? ( video )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	epatch "${FILESDIR}"/${P}-static-libs.patch
+	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
+	mv configure.{in,ac} || die
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	# sorted by `./configure --help`
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-atomic \
+		$(use_enable sound audio) \
+		$(use_enable video) \
+		--enable-render \
+		--enable-events \
+		$(use_enable joystick) \
+		$(use_enable haptic) \
+		--enable-power \
+		--enable-filesystem \
+		$(use_enable threads) \
+		--enable-timers \
+		--enable-file \
+		--disable-loadso \
+		--enable-cpuinfo \
+		--enable-assembly \
+		$(use_enable cpu_flags_x86_sse ssemath) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable altivec) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-alsa-shared \
+		--disable-esd \
+		$(use_enable pulseaudio) \
+		--disable-pulseaudio-shared \
+		--disable-arts \
+		$(use_enable nas) \
+		--disable-nas-shared \
+		--disable-sndio \
+		--disable-sndio-shared \
+		$(use_enable sound diskaudio) \
+		$(use_enable sound dummyaudio) \
+		$(use_enable wayland video-wayland) \
+		--disable-wayland-shared \
+		--disable-video-mir \
+		$(use_enable X video-x11) \
+		--disable-x11-shared \
+		$(use_enable X video-x11-xcursor) \
+		$(use_enable X video-x11-xdbe) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xinput) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable xscreensaver video-x11-scrnsaver) \
+		$(use_enable X video-x11-xshape) \
+		$(use_enable X video-x11-vm) \
+		--disable-video-cocoa \
+		--disable-video-directfb \
+		$(multilib_native_use_enable fusionsound) \
+		--disable-fusionsound-shared \
+		$(use_enable video video-dummy) \
+		$(use_enable opengl video-opengl) \
+		$(use_enable gles video-opengles) \
+		$(use_enable udev libudev) \
+		$(use_enable dbus) \
+		--disable-ibus \
+		$(use_enable tslib input-tslib) \
+		--disable-directx \
+		--disable-rpath \
+		--disable-render-d3d \
+		$(use_with X x)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 181ffe0376da..387be9eb17a8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,7 @@
-DIST MesaLib-10.2.8.tar.bz2 7113716 SHA256 1ef9ad3f241788d454f2ff8c9d65b6849dfc31c8fe91f70fd2930b81c8af1398 SHA512 dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b WHIRLPOOL b54cddecbea167bd501f75c3590050d1cddf44b5a3caa9ce9b8565c6dfc10ce6ba9cae58ff8155e9d1e2aed1656dc596d62a5a026dc11d27ce962c9fd1d9d13e
 DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
-DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b
 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
 DIST mesa-11.0.7.tar.xz 7279276 SHA256 e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb SHA512 cf3bae4db0a3af41d075498ad44f1bff994c30e97d58f9f4bdb52d1c6e1244365d68edfa55bf9076f1b4e9f8f4f3de9661f210291a5d8683e280327e1480c7cf WHIRLPOOL b599f605c1022f06953f11462c46525f2906106707e6e9e0e03c166ee6076eacc7ded68f4367f715556275053473532311aa61b11f99d6d81c647f23ffadd554
+DIST mesa-11.0.8.tar.xz 7282812 SHA256 5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75 SHA512 2e883761b115dece05c527d43653e5169e70ef0d8f0f9fe35027986ca543128b17be668d495cacda4ee95564ba66734ea9954d2434aefaeb9c063f4bbedc1d63 WHIRLPOOL 3a637137076d0fc8ef3f37485683be80103ce6c5a92cef796e491d570aa47aa1ca16fca1b7b74ba697a3a816a5e606d695d0b3b524587e14533d9143830a1790
 DIST mesa-11.1.0.tar.xz 7557948 SHA256 9befe03b04223eb1ede177fa8cac001e2850292c8c12a3ec9929106afad9cf1f SHA512 49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192 WHIRLPOOL c7553dcb8e4fc57f1551e9ab8b01781f5b27a8ecd2e2bbf34bee9009018dcad3c9363de92ab8ffa1394a9b80cbd40c7ee0d0324812a9ebab5bafa96f92534a0c
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.2.8.ebuild b/media-libs/mesa/mesa-10.2.8.ebuild
deleted file mode 100644
index bd390303c656..000000000000
--- a/media-libs/mesa/mesa-10.2.8.ebuild
+++ /dev/null
@@ -1,530 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel openmax pic selinux
-	+udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		llvm
-	)
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.54"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.2.7
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.6
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
-
-	# allow sysfs to serve pci ids instead of libudev
-	epatch "${FILESDIR}"/${PN}-10.2-sysfs-instead-of-libudev.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable openvg gallium-egl)
-			$(use_enable openmax omx)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-10.3.7-r2.ebuild b/media-libs/mesa/mesa-10.3.7-r2.ebuild
deleted file mode 100644
index ab688ae9b48f..000000000000
--- a/media-libs/mesa/mesa-10.3.7-r2.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel openmax pic selinux
-	+udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		llvm
-	)
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.6
-		video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/libGL.so*"
-QA_WX_LOAD="usr/lib*/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
-	epatch "${FILESDIR}"/${PN}-10.3.7-format_utils.c.patch
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable openvg gallium-egl)
-			$(use_enable openmax omx)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-10.6.9.ebuild b/media-libs/mesa/mesa-11.0.8.ebuild
similarity index 92%
rename from media-libs/mesa/mesa-10.6.9.ebuild
rename to media-libs/mesa/mesa-11.0.8.ebuild
index 36d280b429ec..bea9a0efedb3 100644
--- a/media-libs/mesa/mesa-10.6.9.ebuild
+++ b/media-libs/mesa/mesa-11.0.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$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
 	EXPERIMENTAL="true"
 fi
@@ -23,15 +23,16 @@ FOLDER="${PV/_rc*/}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-if [[ $PV == 9999* ]]; then
+if [[ $PV == 9999 ]]; then
 	SRC_URI=""
+	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!bindist? ( bindist )"
 
 INTEL_CARDS="i915 i965 ilo intel"
@@ -63,17 +64,18 @@ REQUIRED_USE="
 	video_cards_i965?   ( classic )
 	video_cards_ilo?    ( gallium )
 	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium llvm )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -85,8 +87,6 @@ RDEPEND="
 	>=app-eselect/eselect-opengl-1.3.0
 	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
@@ -94,7 +94,7 @@ RDEPEND="
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? (
+	llvm? ( !kernel_FreeBSD? (
 		video_cards_radeonsi? ( || (
 			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
 			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
@@ -104,21 +104,20 @@ RDEPEND="
 				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
 				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 				) )
-		)
+		) )
 		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.7
 	)
 	opencl? (
 				app-eselect/eselect-opencl
 				dev-libs/libclc
-				|| (
+				!kernel_FreeBSD? ( || (
 					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
 					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				)
+				) )
 			)
 	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -134,6 +133,9 @@ for card in ${RADEON_CARDS}; do
 		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
 	"
 done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
 
 DEPEND="${RDEPEND}
 	llvm? (
@@ -156,7 +158,7 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
 	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
 "
-[[ ${PV} == "9999" ]] && DEPEND+="
+[[ ${PV} == 9999 ]] && DEPEND+="
 	sys-devel/bison
 	sys-devel/flex
 	${PYTHON_DEPS}
@@ -219,7 +221,7 @@ multilib_src_configure() {
 	fi
 
 	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
 	fi
 
 	if use gallium; then
@@ -232,7 +234,7 @@ multilib_src_configure() {
 			$(use_enable xa)
 			$(use_enable xvmc)
 		"
-		use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
 
 		gallium_enable swrast
 		gallium_enable video_cards_vmware svga
@@ -264,7 +266,7 @@ multilib_src_configure() {
 
 	# x86 hardened pax_kernel needs glx-read-only-text, bug 240956
 	if [[ ${ABI} == x86 ]]; then
-		myconf+="$(use_enable pax_kernel glx-read-only-text)"
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
 	fi
 
 	# on abi_x86_32 hardened we need to have asm disable
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 7ac38359e508..b545010dc287 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,2 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 SHA256 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f WHIRLPOOL a47fcf4cc5da9576cb4683371979175111a1ec746c87ea1140bfb1b71433a3fe5d3df338e8844ab62adc0e6decb4b481d6d8fedb6f635b5bac715d5789077902
-DIST openal-soft-1.16.0.tar.bz2 393280 SHA256 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f SHA512 b89e46902ce475afd47c4c153ae666646e8b277abf1be97f92b6a10dc585ed780c663591398a9fd7e4118595dd45d2d8d6df0101b4148686150bbb3fe2939ddc WHIRLPOOL c1143c0bc0b7299d088b2a2c440309461ba50efd4e8a924066b08411b0f66a02fb92afb6e5a9edc42552a7b59103ec204165b974bdc3297c963e8f9c0dfc55c0
-DIST openal-soft-1.17.0.tar.bz2 484172 SHA256 5e93336de2e7c50f3a01beba51861d6f61c3e4045a896191dc806591e46264d1 SHA512 abe45385c29986cf9848502fc3034392bd03cd12ab969a97e82056ba9151a061f2a268a76abe393bc4b4f8cda69ef9511fccb09c997ddb90082a753c9caaef3d WHIRLPOOL e3f657216b06f40a8dfdf038feedfa58b033b69f30cf55318dba46a1a90c6dcac7c379829e156a32a430433fea20fb25fd4b6b2bb40f3248f511d497cd7bb34e
+DIST openal-soft-1.17.1.tar.bz2 485178 SHA256 087153baab375c23d7aa7e9f3237c0a1d02e336537b485aee56d9ac312baf6f8 SHA512 f0b14e9fdcc22bb18d9c3278392fd94959cd3d85d83ad0472dcac24122fe1f8c818ef8c47197424f6d9789524d0aff64965ce502965f5d6541a772fc8dc3286d WHIRLPOOL f184de05834175b2babb54ae50b38ea01f412e0b56b4c4c5570a318e325dac73e9719cef60167760832d211d74cfb861acc7a8cf9a6946ed51aeb4f07dfaa72b
diff --git a/media-libs/openal/files/openal-1.17.0-jackfix.patch b/media-libs/openal/files/openal-1.17.0-jackfix.patch
deleted file mode 100644
index 6b41478c6ada..000000000000
--- a/media-libs/openal/files/openal-1.17.0-jackfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openal-1.17.0/CMakeLists.txt
-+++ openal-1.17.0/CMakeLists.txt
-@@ -924,7 +924,7 @@
-         SET(HAVE_JACK 1)
-         SET(BACKENDS  "${BACKENDS} JACK${IS_LINKED},")
-         SET(ALC_OBJS  ${ALC_OBJS} Alc/backends/jack.c)
--        ADD_BACKEND_LIBS(${PULSEAUDIO_LIBRARIES})
-+        ADD_BACKEND_LIBS(${JACK_LIBRARIES})
-         IF(CMAKE_VERSION VERSION_LESS "2.8.8")
-             INCLUDE_DIRECTORIES(${JACK_INCLUDE_DIRS})
-         ENDIF()
diff --git a/media-libs/openal/openal-1.15.1-r1.ebuild b/media-libs/openal/openal-1.15.1-r1.ebuild
deleted file mode 100644
index 523716240183..000000000000
--- a/media-libs/openal/openal-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-multilib
-
-MY_P=${PN}-soft-${PV}
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="alsa alstream coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	alstream? ( virtual/ffmpeg )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="alsoftrc.sample env-vars.txt hrtf.txt README"
-
-src_configure() {
-	my_configure() {
-		local mycmakeargs=(
-			$(cmake-utils_use alsa)
-			$(cmake-utils_use coreaudio)
-			$(cmake-utils_use neon)
-			$(cmake-utils_use oss)
-			$(cmake-utils_use portaudio)
-			$(cmake-utils_use pulseaudio)
-			$(cmake-utils_use cpu_flags_x86_sse sse)
-		)
-
-		if multilib_is_native_abi; then
-			mycmakeargs+=( $(cmake-utils_use alstream EXAMPLES) )
-		else
-			mycmakeargs+=( "-DEXAMPLES=OFF" )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.15.1.ebuild b/media-libs/openal/openal-1.15.1.ebuild
deleted file mode 100644
index c533b70ac980..000000000000
--- a/media-libs/openal/openal-1.15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-MY_P=${PN}-soft-${PV}
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="alsa alstream coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	alstream? ( virtual/ffmpeg )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="alsoftrc.sample env-vars.txt hrtf.txt README"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use alsa)
-		$(cmake-utils_use coreaudio)
-		$(cmake-utils_use alstream EXAMPLES)
-		$(cmake-utils_use neon)
-		$(cmake-utils_use oss)
-		$(cmake-utils_use portaudio)
-		$(cmake-utils_use pulseaudio)
-		$(cmake-utils_use cpu_flags_x86_sse sse)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openal/openal-1.16.0.ebuild b/media-libs/openal/openal-1.16.0.ebuild
deleted file mode 100644
index 089fb337fa69..000000000000
--- a/media-libs/openal/openal-1.16.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-multilib
-
-MY_P=${PN}-soft-${PV}
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug oss portaudio pulseaudio qt4
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	neon
-"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="alsoftrc.sample env-vars.txt hrtf.txt README"
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
-			"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
-			"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
-			"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
-			"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"
-			"-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse ON OFF)"
-			"-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-			"-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)"
-			"-DALSOFT_CPUEXT_NEON=$(usex neon ON OFF)"
-			"-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")"
-			"-DALSOFT_NO_CONFIG_UTIL=$(usex qt4 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)"
-			"-DALSOFT_EXAMPLES=OFF"
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.17.0.ebuild b/media-libs/openal/openal-1.17.1.ebuild
similarity index 92%
rename from media-libs/openal/openal-1.17.0.ebuild
rename to media-libs/openal/openal-1.17.1.ebuild
index 5c6070aee668..59619fa72e3c 100644
--- a/media-libs/openal/openal-1.17.0.ebuild
+++ b/media-libs/openal/openal-1.17.1.ebuild
@@ -15,12 +15,13 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="
-	alsa coreaudio debug oss portaudio pulseaudio qt4
+	alsa coreaudio debug jack oss portaudio pulseaudio qt4
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
 	neon
 "
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
@@ -35,20 +36,13 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="alsoftrc.sample env-vars.txt hrtf.txt ChangeLog README"
 
-PATCHES=(
-	"${FILESDIR}/${P}-jackfix.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 src_configure() {
 	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
 	my_configure() {
 		local mycmakeargs=(
 			"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
 			"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
+			"-DALSOFT_BACKEND_JACK=$(usex jack ON OFF)"
 			"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
 			"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
 			"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index b880e2f1c948..146403bb8947 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1 +1,2 @@
 DIST SDL2_image-2.0.0.tar.gz 8398016 SHA256 b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234 SHA512 300ff078c4c9a74ccc143692630e9c97e25a223bf80661cd5e7d684a25c6ad7760b20778d492d6cc41521dcd2a00e4a76947cf6dffc679fdbd54f430b3906ea6 WHIRLPOOL d2b89f0bcb25eeda168a6a4622777f3d9bd6343dc1f87f50aec69afb85fef71dc28e56ed29e30d906ff999f291cf3ec887d20f471bd870eb734f273fd68b4303
+DIST SDL2_image-2.0.1.tar.gz 7797848 SHA256 3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f WHIRLPOOL ba4a78ae19ba1921b0d11208f93390cc0ec31aed86f302c2b8d4ac8c55a8e783c29a3180d8557309b2874d74a081734256e9cb0d8215b369090abddf64bd0a7c
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
new file mode 100644
index 000000000000..0cb880335ebf
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=SDL2_image-${PV}
+DESCRIPTION="Image file loading library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--disable-sdltest \
+		--enable-bmp \
+		$(use_enable gif) \
+		$(use_enable jpeg jpg) \
+		--disable-jpg-shared \
+		--enable-lbm \
+		--enable-pcx \
+		$(use_enable png) \
+		--disable-png-shared \
+		--enable-pnm \
+		--enable-tga \
+		$(use_enable tiff tif) \
+		--disable-tif-shared \
+		--enable-xcf \
+		--enable-xpm \
+		--enable-xv \
+		$(use_enable webp) \
+		--disable-webp-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage showimage2
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index d9021f3f10cd..d765ce3a67fc 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1 +1,2 @@
 DIST SDL2_mixer-2.0.0.tar.gz 10119589 SHA256 a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b SHA512 e04594abc13c2b6527cd92a94a8d3e18436e9e6aaee21bab83e288e259a2fb20aae8433765d07feeb3b5bf253951323d67054239091e79720846770beb30be4d WHIRLPOOL 58385d7bdb3382af4f9d3aa9904b40083fe1139af0c938fa807904d70d4561180f65314bb2ab56f3b67a35140252e72802753ed723bca2536a4745fad43cb905
+DIST SDL2_mixer-2.0.1.tar.gz 10213891 SHA256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d WHIRLPOOL b9ebeaad35ed92e8de111872d17ceefdc996ebbbb91f3b35fa9ab62573fae972e1a1626cc86141260c69af87a53a0880230ec399fe06fa3c5a98b20d82be8515
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
new file mode 100644
index 000000000000..14879cc35c8f
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=SDL2_mixer-${PV}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	tremor? ( vorbis )
+	"
+
+RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
+	)
+	mod? (
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+		!tremor? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	)"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-sdltest \
+		--enable-music-cmd \
+		$(use_enable wav music-wave) \
+		$(use_enable mod music-mod) \
+		$(use_enable modplug music-mod-modplug) \
+		--disable-music-mod-modplug-shared \
+		$(use_enable mikmod music-mod-mikmod) \
+		--disable-music-mod-mikmod-shared \
+		$(use_enable midi music-midi) \
+		$(use_enable timidity music-midi-timidity) \
+		$(use_enable fluidsynth music-midi-fluidsynth) \
+		--disable-music-midi-fluidsynth-shared \
+		$(use_enable vorbis music-ogg) \
+		$(use_enable tremor music-ogg-tremor) \
+		--disable-music-ogg-shared \
+		$(use_enable flac music-flac) \
+		--disable-music-flac-shared \
+		$(use_enable mp3 music-mp3) \
+		$(use_enable smpeg music-mp3-smpeg) \
+		--disable-music-mp3-smpeg-shared \
+		--disable-smpegtest \
+		$(use_enable mad music-mp3-mad-gpl) \
+		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 29c223fc6941..9e54def39bd7 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1 +1,2 @@
 DIST SDL2_net-2.0.0.tar.gz 345724 SHA256 d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab SHA512 bf91f18bb1c62f00cccc3aa459c18c120afc3d8e16ee92c01762ef890f620b5346b1b62ca48ae0b848a062b49656e5f7a4c27d74788a8788357b5e36c1a767a2 WHIRLPOOL 7c5fc3f1df0a1467ca7869eb1a26028f84a44c35fe308a36b08bce938230ed9532f4d105683fb3752de59ca739025261cdaf3f9e795fe6027db6e063b6bd620d
+DIST SDL2_net-2.0.1.tar.gz 347436 SHA256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a WHIRLPOOL bd704fe9b3bae9ca0c4da474b57a6f944a9bc75f7054c91eff279d6039ead5f41cf9bf5dc3092bdc84494d2ac092aa7877df88368fc4b51c0adbc06b9c24f27e
diff --git a/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
new file mode 100644
index 000000000000..33e3f90a5e71
--- /dev/null
+++ b/media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=SDL2_net-${PV}
+DESCRIPTION="Simple Direct Media Layer Network Support Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_net/index.html"
+SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-gui \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 9b1cfdade06c..dbb37ef62588 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1 +1,2 @@
 DIST SDL2_ttf-2.0.12.tar.gz 5517665 SHA256 8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e SHA512 2dfd7d9a87d86b0446e52c78dcf4c45dba747256ff9cb4cc010818eac725410f5a1a781e6695ca0bcead756c70519d8d5b4df6c1b2935085e0356d9b4d7844fa WHIRLPOOL 7b3457925237f741bdcb1b6b00aa0463f33bde4c8886f03de4cc20885bffadfe3759fb31852dfee1ced06e0e494ec639f0a6a0f415520d9998683b81d010836b
+DIST SDL2_ttf-2.0.13.tar.gz 4152978 SHA256 25ddad0302e7d74ce16a770974930cefbdcf67499ca7d40ce7a6bd7de6022fdf SHA512 24f7d77c7d46be3c8236d6edde42f40c97c778e2fdb5d7923f1ec473ce19039c382843afe6de79f04c014d3f854cdf912cdfe1e0cf803a2fd246fd4c65360c6b WHIRLPOOL 52cc6db07d049c6b35f5f68cbc9ed9e3622052a014e1b86ccc0a4b7daa1058a9b8e0f1ca5a42e7ddace0acc4978c4277133611571b1f3a543f048714a615f949
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
new file mode 100644
index 000000000000..1b07e1874970
--- /dev/null
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+MY_P=SDL2_ttf-${PV}
+DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
+SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs X"
+
+RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_with X x)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 0c6d0695e2c4..fa8a1ae0afc0 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1 +1,2 @@
+DIST taglib-1.10.tar.gz 1233893 SHA256 2cd09ac6d4c4ec610aa5a0a488466bd0e0f78576581ef1f344090e397ecb9c52 SHA512 bf3256b08c4fa35d9416b50d700a6634222485e481528bd2a711ae7ec0d48ee99aed66286199f30e5391218aa818a692b92c779b5fcf40617a78b767bfd9b9a5 WHIRLPOOL ae55b391a69416877674ba9bdf01fcca06a216589c620785a4d7a489b548969bf317ce8d08aab9309325564f7ebe8e4b0c51f8bf2269c6d995f2a1ad8b430790
 DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
diff --git a/media-libs/taglib/taglib-1.10.ebuild b/media-libs/taglib/taglib-1.10.ebuild
new file mode 100644
index 000000000000..540b69b8148c
--- /dev/null
+++ b/media-libs/taglib/taglib-1.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+SLOT="0"
+IUSE="+asf debug examples +mp4 test"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-install-examples.patch
+)
+
+DOCS=( AUTHORS NEWS )
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(multilib_is_native_abi && cmake-utils_use_build examples)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_with asf)
+		$(cmake-utils_use_with mp4)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# ctest does not work
+	emake -C "${BUILD_DIR}" check
+}
+
+pkg_postinst() {
+	if ! use asf; then
+		elog "You've chosen to disable the asf use flag, thus taglib won't include"
+		elog "support for Microsoft's 'advanced systems format' media container"
+	fi
+	if ! use mp4; then
+		elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
+		elog "support for the MPEG-4 part 14 / MP4 media container"
+	fi
+}
diff --git a/media-libs/varconf/varconf-0.6.7-r1.ebuild b/media-libs/varconf/varconf-0.6.7-r1.ebuild
index ae5f5e3700c2..247c7aceb873 100644
--- a/media-libs/varconf/varconf-0.6.7-r1.ebuild
+++ b/media-libs/varconf/varconf-0.6.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libsigc++-2.0"
diff --git a/media-sound/gejengel/gejengel-0.1.4-r2.ebuild b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
index 79c795430b5c..627016e210f3 100644
--- a/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog"
 
 RDEPEND="dev-cpp/gtkmm:2.4
diff --git a/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
new file mode 100644
index 000000000000..06446900e2a7
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch
@@ -0,0 +1,61 @@
+commit c126ad8142c51476c4a1b78ab9e6d7409656b312
+Author: Michael Palimaka <kensington@gentoo.org>
+Date:   Tue Aug 25 00:05:20 2015 +1000
+
+    Fix build with kdelibs-4.14.11.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ab5d20..99cf392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -473,6 +473,13 @@ else (UNIX AND NOT APPLE)
+   set(KID3_EXECUTABLE kid3)
+ endif (UNIX AND NOT APPLE)
+ 
++if (BUILD_KDE_APP)
++  if (NOT HAVE_QT5)
++    find_package(KDE4 REQUIRED)
++    include (KDE4Defaults)
++    add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++  endif (NOT HAVE_QT5)
++endif (BUILD_KDE_APP)
+ 
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
+index 6f25b68..70f6793 100644
+--- a/doc/de/CMakeLists.txt
++++ b/doc/de/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+   if (HAVE_QT5)
+     kf5_create_handbook(index.docbook)
+   else (HAVE_QT5)
+-    find_package(KDE4 REQUIRED)
+     kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/de SUBDIR kid3)
+   endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
+index b3751b3..7cff8e1 100644
+--- a/doc/en/CMakeLists.txt
++++ b/doc/en/CMakeLists.txt
+@@ -2,7 +2,6 @@ if (BUILD_KDE_APP)
+   if (HAVE_QT5)
+     kf5_create_handbook(index.docbook)
+   else (HAVE_QT5)
+-    find_package(KDE4 REQUIRED)
+     kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kid3)
+   endif (HAVE_QT5)
+ endif (BUILD_KDE_APP)
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index d19ebb5..516e3f9 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -65,8 +65,6 @@ if (BUILD_KDE_APP)
+     )
+   else (HAVE_QT5)
+     set(_cmakeInstallRpath "${CMAKE_INSTALL_RPATH}")
+-    find_package(KDE4 REQUIRED)
+-    include (KDE4Defaults)
+ 
+     if (BUILD_SHARED_LIBS)
+       # FindKDE4Internal.cmake will overwrite our RPATH if LIB_INSTALL_DIR (which
diff --git a/media-sound/kid3/kid3-3.2.1.ebuild b/media-sound/kid3/kid3-3.2.1.ebuild
index f6be3bc94ba6..3afd6e610bb9 100644
--- a/media-sound/kid3/kid3-3.2.1.ebuild
+++ b/media-sound/kid3/kid3-3.2.1.ebuild
@@ -48,6 +48,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fix-cmake.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with acoustid CHROMAPRINT)
diff --git a/media-video/mpv/mpv-0.11.0-r1.ebuild b/media-video/mpv/mpv-0.11.0-r1.ebuild
index dc450c204e48..0b961be4a92e 100644
--- a/media-video/mpv/mpv-0.11.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.11.0-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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/mpv/mpv-0.14.0.ebuild b/media-video/mpv/mpv-0.14.0.ebuild
index f6a048592df9..234d32dd5684 100644
--- a/media-video/mpv/mpv-0.14.0.ebuild
+++ b/media-video/mpv/mpv-0.14.0.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$
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild b/media-video/mpv/mpv-0.9.2-r1.ebuild
index 23d654b1694e..9f5e768d7ba3 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-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$
 
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS+=( RELEASE_NOTES )
 fi
 
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index c5150987bd9e..c0242470c525 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7c4eeea3764c..19337a950512 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jan 2016 22:14:19 +0000
+Mon, 04 Jan 2016 20:14:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dc72acb81c44..19337a950512 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jan 2016 22:14:20 +0000
+Mon, 04 Jan 2016 20:14:02 +0000
diff --git a/metadata/md5-cache/app-admin/calamares-1.1.2-r1 b/metadata/md5-cache/app-admin/calamares-1.1.2-r1
index cecd5c45b64b..f7bfb80cbc1e 100644
--- a/metadata/md5-cache/app-admin/calamares-1.1.2-r1
+++ b/metadata/md5-cache/app-admin/calamares-1.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/linguist-tools:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtquick1:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/linguist-tools:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtquick1:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Distribution-independent installer framework
 EAPI=5
 HOMEPAGE=http://calamares.io
 IUSE=+networkmanager +upower debug python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/linguist-tools:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtquick1:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5] app-admin/sudo dev-libs/libatasmart net-misc/rsync sys-apps/gptfdisk >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/gummiboot ) sys-boot/os-prober sys-fs/squashfs-tools sys-fs/udisks:2[systemd] virtual/udev[systemd] networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/linguist-tools:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtquick1:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5] app-admin/sudo dev-libs/libatasmart net-misc/rsync sys-apps/gptfdisk >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/gummiboot ) sys-boot/os-prober sys-fs/squashfs-tools sys-fs/udisks:2[systemd] virtual/udev[systemd] networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v1.1.2/calamares-1.1.2.tar.gz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6f82de149621e538ba85d7217ca1f269
diff --git a/metadata/md5-cache/app-admin/cgmanager-0.39 b/metadata/md5-cache/app-admin/cgmanager-0.39
index 14173b8feae4..98ec86e52327 100644
--- a/metadata/md5-cache/app-admin/cgmanager-0.39
+++ b/metadata/md5-cache/app-admin/cgmanager-0.39
@@ -4,10 +4,10 @@ DESCRIPTION=Control Group manager daemon
 EAPI=5
 HOMEPAGE=https://linuxcontainers.org/cgmanager/introduction/
 IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmanager )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/cgmanager/cgmanager-0.39.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9e59073afcc8b4ea0cc0f36c043feaea
+_md5_=ac29c2c564b7d92a25db8128e6b3925f
diff --git a/metadata/md5-cache/app-admin/collectd-5.5.0 b/metadata/md5-cache/app-admin/collectd-5.5.0
index 995e09b46ffb..b8a87076c8e4 100644
--- a/metadata/md5-cache/app-admin/collectd-5.5.0
+++ b/metadata/md5-cache/app-admin/collectd-5.5.0
@@ -11,4 +11,4 @@ REQUIRED_USE=collectd_plugins_python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.5.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3c33aa1abd99e9bd95c7c728a050ea03
+_md5_=361f66fb0c4d2da7a98d03e97b2fcf0c
diff --git a/metadata/md5-cache/app-admin/packagekit-0.7.4 b/metadata/md5-cache/app-admin/packagekit-0.7.4
deleted file mode 100644
index b82759b3c831..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-0.7.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=gtk? ( ~app-admin/packagekit-gtk-0.7.4 ) qt4? ( ~app-admin/packagekit-qt4-0.7.4 )
-DESCRIPTION=PackageKit Package Manager interface (meta package)
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-IUSE=gtk qt4
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=gtk? ( ~app-admin/packagekit-gtk-0.7.4 ) qt4? ( ~app-admin/packagekit-qt4-0.7.4 )
-SLOT=0
-_md5_=a72b14195c24fbcf57a1b4322753e783
diff --git a/metadata/md5-cache/app-admin/packagekit-1.0.11 b/metadata/md5-cache/app-admin/packagekit-1.0.11
new file mode 100644
index 000000000000..49da1d88e4bb
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-1.0.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=gtk? ( ~app-admin/packagekit-gtk-1.0.11 ) qt4? ( >=app-admin/packagekit-qt4-0.9 )
+DESCRIPTION=PackageKit Package Manager interface (meta package)
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+IUSE=gtk qt4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=gtk? ( ~app-admin/packagekit-gtk-1.0.11 ) qt4? ( >=app-admin/packagekit-qt4-0.9 )
+SLOT=0
+_md5_=0719995315d230998dfb4e2bc82e3524
diff --git a/metadata/md5-cache/app-admin/packagekit-base-0.7.4 b/metadata/md5-cache/app-admin/packagekit-base-0.7.4
deleted file mode 100644
index fe37caf295f9..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-base-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm
-DEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9 ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) policykit? ( >=sys-auth/polkit-0.98 ) udev? ( virtual/libgudev ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.26.1:2 >=sys-apps/dbus-1.3.0 doc? ( dev-util/gtk-doc ) nsplugin? ( <net-misc/npapi-sdk-0.27.1 ) dev-libs/libxslt >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gettext =dev-lang/python-2* app-arch/unzip
-DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-IUSE=connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev linguas_as linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_kn linguas_ko linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9 ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) policykit? ( >=sys-auth/polkit-0.98 ) udev? ( virtual/libgudev ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.26.1:2 >=sys-apps/dbus-1.3.0 entropy? ( >=sys-apps/entropy-1.0_rc27 ) pm-utils? ( sys-power/pm-utils ) >=app-portage/layman-1.2.3 >=sys-apps/portage-2.1.9 sys-auth/consolekit =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.7.4.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5cb0a0251c386b211b44aec0b4b45958
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.0.11 b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
new file mode 100644
index 000000000000..a94ded962b29
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.0.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32.0:2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) systemd? ( >=sys-apps/systemd-204 ) dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig nsplugin? ( >=net-misc/npapi-sdk-0.27 ) vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/unzip virtual/pkgconfig
+DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+IUSE=connman cron command-not-found +introspection networkmanager nsplugin entropy systemd test vala python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32.0:2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) systemd? ( >=sys-apps/systemd-204 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) !systemd? ( sys-auth/consolekit )
+REQUIRED_USE=python_targets_python2_7 vala? ( introspection )
+RESTRICT=test
+SLOT=0/18
+SRC_URI=http://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.0.11.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=75eb8c4979cb327a1d06ea7bdc60c37d
diff --git a/metadata/md5-cache/app-admin/packagekit-gtk-0.7.4 b/metadata/md5-cache/app-admin/packagekit-gtk-0.7.4
deleted file mode 100644
index f30afc2f2d43..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-gtk-0.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-3.0:3 x11-libs/pango ~app-admin/packagekit-base-0.7.4 virtual/pkgconfig
-DESCRIPTION=Gtk3 PackageKit backend library
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-3.0:3 x11-libs/pango ~app-admin/packagekit-base-0.7.4
-SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.7.4.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2ca8689212b9f1ff89ca05096e36b4e5
diff --git a/metadata/md5-cache/app-admin/packagekit-gtk-1.0.11 b/metadata/md5-cache/app-admin/packagekit-gtk-1.0.11
new file mode 100644
index 000000000000..1359d4594399
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-gtk-1.0.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-libs/glib-2.32:2 media-libs/fontconfig >=x11-libs/gtk+-2:2 >=x11-libs/gtk+-3:3 x11-libs/pango ~app-admin/packagekit-base-1.0.11[introspection] virtual/pkgconfig
+DESCRIPTION=Gtk3 PackageKit backend library
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 media-libs/fontconfig >=x11-libs/gtk+-2:2 >=x11-libs/gtk+-3:3 x11-libs/pango ~app-admin/packagekit-base-1.0.11[introspection]
+SLOT=0
+SRC_URI=http://www.packagekit.org/releases/PackageKit-1.0.11.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=64af4ca4552ff35c5f45dc1558969416
diff --git a/metadata/md5-cache/app-admin/packagekit-qt4-0.7.4 b/metadata/md5-cache/app-admin/packagekit-qt4-0.7.4
deleted file mode 100644
index 68d635a7e373..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-qt4-0.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 ~app-admin/packagekit-base-0.7.4 dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=Qt4 PackageKit backend library
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 ~app-admin/packagekit-base-0.7.4
-SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.7.4.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d0c58d5f9f41a14535bccb81f67723da
diff --git a/metadata/md5-cache/app-admin/packagekit-qt4-0.9.5 b/metadata/md5-cache/app-admin/packagekit-qt4-0.9.5
new file mode 100644
index 000000000000..ad4e53ed1eb0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-qt4-0.9.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 >=app-admin/packagekit-base-0.9 dev-libs/libxslt virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Qt4 PackageKit backend library
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 >=app-admin/packagekit-base-0.9
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/PackageKit/releases/PackageKit-Qt-0.9.5.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=23dbe43cb9fd6d0731f4f6e04bcb5b61
diff --git a/metadata/md5-cache/app-admin/qtpass-1.0.5 b/metadata/md5-cache/app-admin/qtpass-1.0.5
new file mode 100644
index 000000000000..a8cb73013636
--- /dev/null
+++ b/metadata/md5-cache/app-admin/qtpass-1.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) app-admin/pass qt5? ( dev-qt/linguist-tools:5 )
+DESCRIPTION=multi-platform GUI for pass, the standard unix password manager
+EAPI=5
+HOMEPAGE=https://qtpass.org/
+IUSE=+qt5
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[xcb] dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) app-admin/pass
+SLOT=0
+SRC_URI=https://github.com/IJHack/qtpass/archive/v1.0.5.tar.gz -> qtpass-1.0.5.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ddd05be9d0b0f45b6461240637104243
diff --git a/metadata/md5-cache/app-backup/backintime-1.1.8-r1 b/metadata/md5-cache/app-backup/backintime-1.1.8-r1
new file mode 100644
index 000000000000..cd3ae1ad4989
--- /dev/null
+++ b/metadata/md5-cache/app-backup/backintime-1.1.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl]
+DESCRIPTION=Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4
+EAPI=5
+HOMEPAGE=http://backintime.le-web.org/
+IUSE=qt4 python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt4? ( dev-python/PyQt4 )
+REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.1.8.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=2c496bced7b5be0826a5793b2df2ff10
diff --git a/metadata/md5-cache/app-doc/abs-guide-6.6 b/metadata/md5-cache/app-doc/abs-guide-6.6
deleted file mode 100644
index 895e618d9540..000000000000
--- a/metadata/md5-cache/app-doc/abs-guide-6.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An advanced reference and a tutorial on bash shell scripting
-EAPI=4
-HOMEPAGE=http://www.tldp.org/LDP/abs/html
-IUSE=pdf
-KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86
-LICENSE=OPL
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dirtyepic/dist/abs-guide-6.6.tar.bz2 pdf? ( https://dev.gentoo.org/~dirtyepic/dist/abs-guide-6.6.pdf )
-_md5_=09d030dd88d6428334dc60753356daf0
diff --git a/metadata/md5-cache/app-doc/csound-manual-5.17 b/metadata/md5-cache/app-doc/csound-manual-5.17
deleted file mode 100644
index c3aee1d6d251..000000000000
--- a/metadata/md5-cache/app-doc/csound-manual-5.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=The Csound reference manual
-EAPI=4
-HOMEPAGE=http://csounds.com/
-IUSE=html linguas_fr
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3
-SLOT=0
-SRC_URI=mirror://sourceforge/csound/Csound5.17_manual_pdf.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual-fr_pdf.zip ) html? ( mirror://sourceforge/csound/Csound5.17_manual_html.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual-fr_html.zip ) )
-_md5_=1b707af99338ce845ed18cfbf9eef260
diff --git a/metadata/md5-cache/app-doc/csound-manual-5.18 b/metadata/md5-cache/app-doc/csound-manual-5.18
deleted file mode 100644
index 5055775bc9d7..000000000000
--- a/metadata/md5-cache/app-doc/csound-manual-5.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=The Csound reference manual
-EAPI=4
-HOMEPAGE=http://csounds.com/
-IUSE=html linguas_fr
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3
-SLOT=0
-SRC_URI=mirror://sourceforge/csound/Csound5.18_manual_pdf.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.18_manual-fr_pdf.zip ) html? ( mirror://sourceforge/csound/Csound5.18_manual_html.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.18_manual-fr_html.zip ) )
-_md5_=1b707af99338ce845ed18cfbf9eef260
diff --git a/metadata/md5-cache/app-doc/csound-manual-5.19 b/metadata/md5-cache/app-doc/csound-manual-5.19
deleted file mode 100644
index b0da5394c608..000000000000
--- a/metadata/md5-cache/app-doc/csound-manual-5.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=The Csound reference manual
-EAPI=4
-HOMEPAGE=http://csounds.com/
-IUSE=html linguas_fr
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3
-SLOT=0
-SRC_URI=mirror://sourceforge/csound/Csound5.19_manual_pdf.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.19_manual-fr_pdf.zip ) html? ( mirror://sourceforge/csound/Csound5.19_manual_html.zip linguas_fr? ( mirror://sourceforge/csound/Csound5.19_manual-fr_html.zip ) )
-_md5_=e4afbf61a52e572fce939e28a908becd
diff --git a/metadata/md5-cache/app-editors/kile-2.1.3-r1 b/metadata/md5-cache/app-editors/kile-2.1.3-r2
similarity index 66%
rename from metadata/md5-cache/app-editors/kile-2.1.3-r1
rename to metadata/md5-cache/app-editors/kile-2.1.3-r2
index 1cca14dcb929..25b8e2a41bb5 100644
--- a/metadata/md5-cache/app-editors/kile-2.1.3-r1
+++ b/metadata/md5-cache/app-editors/kile-2.1.3-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://kile.sourceforge.net/
 IUSE=debug +pdf +png +handbook aqua
 KEYWORDS=amd64 ~ppc x86
 LICENSE=FDL-1.2 GPL-2
-RDEPEND=x11-misc/shared-mime-info >=kde-apps/kdebase-data-4.4:4[aqua=] >=kde-apps/konsole-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] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+RDEPEND=x11-misc/shared-mime-info >=kde-apps/kdebase-data-4.4:4[aqua=] || ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-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] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/kile/kile-2.1.3.tar.bz2
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8d84208610a4c0ca410da3036457cbe4
+_md5_=ff7a70263700c4d6bf11834137e5372a
diff --git a/metadata/md5-cache/app-emulation/xen-4.6.0-r5 b/metadata/md5-cache/app-emulation/xen-4.6.0-r5
new file mode 100644
index 000000000000..e66cf72b8e79
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.6.0-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm ~arm64 -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.6.0
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.6.0/xen-4.6.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.6.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-0.tar.xz https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-4.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	mount-boot	41ed556fa5641393d5323e421c8e5bcf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5860be4f79da14794f769dfe38338ac4
diff --git a/metadata/md5-cache/app-forensics/afl-1.57b b/metadata/md5-cache/app-forensics/afl-1.57b
deleted file mode 100644
index 0630ef743215..000000000000
--- a/metadata/md5-cache/app-forensics/afl-1.57b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc
-DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=5
-HOMEPAGE=http://lcamtuf.coredump.cx/afl/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc
-SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases//afl-1.57b.tgz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d8c4c86799293cafdd7b11ef9a45e6d5
diff --git a/metadata/md5-cache/app-forensics/afl-1.80b b/metadata/md5-cache/app-forensics/afl-1.80b
index 440992e40b9b..c0f040bafe9e 100644
--- a/metadata/md5-cache/app-forensics/afl-1.80b
+++ b/metadata/md5-cache/app-forensics/afl-1.80b
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=sys-devel/gcc:* sys-devel/clang
 SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases//afl-1.80b.tgz
+SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-1.80b.tgz
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b5fa7bf5d23b5977873fc2d552cb702a
+_md5_=429090e639bad5a4832cd12ef675bb63
diff --git a/metadata/md5-cache/app-forensics/afl-1.45b b/metadata/md5-cache/app-forensics/afl-1.96b
similarity index 61%
rename from metadata/md5-cache/app-forensics/afl-1.45b
rename to metadata/md5-cache/app-forensics/afl-1.96b
index 9cec12595abb..002ba9094332 100644
--- a/metadata/md5-cache/app-forensics/afl-1.45b
+++ b/metadata/md5-cache/app-forensics/afl-1.96b
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc
+DEPEND=sys-devel/gcc:* sys-devel/clang
 DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
 EAPI=5
 HOMEPAGE=http://lcamtuf.coredump.cx/afl/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc
+RDEPEND=sys-devel/gcc:* sys-devel/clang
 SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases//afl-1.45b.tgz
+SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-1.96b.tgz
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d8c4c86799293cafdd7b11ef9a45e6d5
+_md5_=429090e639bad5a4832cd12ef675bb63
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
index 4d3339e60cd2..2e975fbc9020 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8567d14ff4e4f8650f6eb01ef65477b6
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
index 8e1d3c3866df..95ac4a2b38a4 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8567d14ff4e4f8650f6eb01ef65477b6
diff --git a/metadata/md5-cache/app-misc/abook-0.6.0_pre2 b/metadata/md5-cache/app-misc/abook-0.6.0_pre2
index b41f1a919b37..eeb13672c270 100644
--- a/metadata/md5-cache/app-misc/abook-0.6.0_pre2
+++ b/metadata/md5-cache/app-misc/abook-0.6.0_pre2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=nls? ( sys-devel/gettext )
 DESCRIPTION=Abook is a text-based addressbook program designed to use with mutt mail client
 EAPI=3
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses sys-libs/readline nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.0pre2.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4e9c4ddcc886f81cb79ab3c72f3abe91
+_md5_=fc929d2ef0afa83699469f68d27e1395
diff --git a/metadata/md5-cache/app-misc/abook-0.6.1 b/metadata/md5-cache/app-misc/abook-0.6.1
new file mode 100644
index 000000000000..a025595d89f0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/abook-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=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=Abook is a text-based addressbook program designed to use with mutt mail client
+EAPI=5
+HOMEPAGE=http://abook.sourceforge.net/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses sys-libs/readline dev-libs/libvformat nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=80e39aabae536085615f18611c58d239
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-1.3 b/metadata/md5-cache/app-misc/carbon-c-relay-1.4
similarity index 74%
rename from metadata/md5-cache/app-misc/carbon-c-relay-1.3
rename to metadata/md5-cache/app-misc/carbon-c-relay-1.4
index 37bf4b46f911..829053b03af7 100644
--- a/metadata/md5-cache/app-misc/carbon-c-relay-1.3
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-1.4
@@ -5,6 +5,6 @@ HOMEPAGE=https://github.com/grobian/carbon-c-relay
 KEYWORDS=~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://github.com/grobian/carbon-c-relay/archive/v1.3.tar.gz -> carbon-c-relay-1.3.tar.gz
+SRC_URI=https://github.com/grobian/carbon-c-relay/archive/v1.4.tar.gz -> carbon-c-relay-1.4.tar.gz
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=4181cf3a5d1ed134dc3efd9a4e4e31f8
+_md5_=95d0161963a2c7517b65754f3b6bdc4b
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.6 b/metadata/md5-cache/app-misc/chkcrontab-1.6
new file mode 100644
index 000000000000..57a4f471c418
--- /dev/null
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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=A tool to detect crontab errors
+EAPI=6
+HOMEPAGE=https://github.com/lyda/chkcrontab
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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=https://github.com/lyda/chkcrontab/archive/v1.6.tar.gz -> chkcrontab-1.6.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6a169c120cff3f7436a1443b1dae3725
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r1 b/metadata/md5-cache/app-misc/taskd-1.1.0-r1
new file mode 100644
index 000000000000..e61639d2dff6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/taskd-1.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=sys-libs/readline:0 net-libs/gnutls sys-apps/util-linux sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=the server part of Taskwarrior, a command-line todo list manager
+EAPI=5
+HOMEPAGE=http://taskwarrior.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/readline:0 net-libs/gnutls sys-apps/util-linux
+SLOT=0
+SRC_URI=http://taskwarrior.org/download/taskd-1.1.0.tar.gz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c6020ccfc22c32334aacbae87f5801bb
diff --git a/metadata/md5-cache/app-office/skrooge-2.1.1 b/metadata/md5-cache/app-office/skrooge-2.1.1
index a9b3a5e50b30..93b9da03ba13 100644
--- a/metadata/md5-cache/app-office/skrooge-2.1.1
+++ b/metadata/md5-cache/app-office/skrooge-2.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.14.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) >=kde-frameworks/kdesignerplugin-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-libs/boost dev-libs/libxslt dev-libs/qjson dev-qt/designer:5 dev-qt/qtnetwork:5 virtual/pkgconfig x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.15.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) >=kde-frameworks/kdesignerplugin-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-libs/boost dev-libs/libxslt dev-libs/qjson dev-qt/designer:5 dev-qt/qtnetwork:5 virtual/pkgconfig x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
 EAPI=5
 HOMEPAGE=http://www.skrooge.org/
 IUSE=activities crypt ofx test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.14.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.15.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.1.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9a77b83ec0ecc220029ad96b73fef56a
diff --git a/metadata/md5-cache/app-office/skrooge-2.2.0 b/metadata/md5-cache/app-office/skrooge-2.2.0
index 8b3cbc0dfa33..4bd50f0c2ca1 100644
--- a/metadata/md5-cache/app-office/skrooge-2.2.0
+++ b/metadata/md5-cache/app-office/skrooge-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.14.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) >=kde-frameworks/kdesignerplugin-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-libs/libxslt dev-qt/designer:5 virtual/pkgconfig x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.15.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) >=kde-frameworks/kdesignerplugin-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-libs/libxslt dev-qt/designer:5 virtual/pkgconfig x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
 EAPI=5
 HOMEPAGE=http://www.skrooge.org/
 IUSE=activities crypt ofx test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.14.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 app-crypt/qca:2[qt5] dev-libs/grantlee:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 activities? ( >=kde-frameworks/kactivities-5.15.0:5 ) crypt? ( dev-db/sqlcipher ) !crypt? ( dev-db/sqlite:3 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.2.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1d616127014ddc09c5ad7d16625158be
diff --git a/metadata/md5-cache/app-portage/eix-0.30.10 b/metadata/md5-cache/app-portage/eix-0.30.10
index ed50a2412a2f..ee81affc3237 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.10
+++ b/metadata/md5-cache/app-portage/eix-0.30.10
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.30.10/eix-0.30.10.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3ab1dfd26b9eba8cdd855687008f0d2f
+_md5_=109d23e516e073c9c4230fbd963c1d66
diff --git a/metadata/md5-cache/app-portage/eix-0.30.11 b/metadata/md5-cache/app-portage/eix-0.30.11
index c1581f75968d..700dacdf59a6 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.11
+++ b/metadata/md5-cache/app-portage/eix-0.30.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.30.11/eix-0.30.11.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0943c528cf20f9e2586098864f927fff
+_md5_=b480129f1a7fe916caf2259bc6ef88e8
diff --git a/metadata/md5-cache/app-portage/eix-0.30.4 b/metadata/md5-cache/app-portage/eix-0.30.4
index 9812503ec334..2b7a1bcdcd41 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.4
+++ b/metadata/md5-cache/app-portage/eix-0.30.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/eix-0.30.4.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=162cb980e4b09613c2069730f6ed72fc
+_md5_=9628f349ddfaf4016155e05997d8ff69
diff --git a/metadata/md5-cache/app-portage/eix-0.30.7 b/metadata/md5-cache/app-portage/eix-0.30.7
index 0a4cacbb7c42..c092a7a7d128 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.7
+++ b/metadata/md5-cache/app-portage/eix-0.30.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/eix-0.30.7.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ee242f9f0c2485eaf949c1817ef05cc9
+_md5_=1107c8e61bf51735395646265996c8fe
diff --git a/metadata/md5-cache/app-portage/eix-0.30.8 b/metadata/md5-cache/app-portage/eix-0.30.8
index 21c6233eca87..501a003780c2 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.8
+++ b/metadata/md5-cache/app-portage/eix-0.30.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/eix-0.30.8.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ee242f9f0c2485eaf949c1817ef05cc9
+_md5_=1107c8e61bf51735395646265996c8fe
diff --git a/metadata/md5-cache/app-portage/eix-0.31.1 b/metadata/md5-cache/app-portage/eix-0.31.1
index 457bf71c0db6..e249e14c5c27 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.1
+++ b/metadata/md5-cache/app-portage/eix-0.31.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
 DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
 EAPI=5
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.1/eix-0.31.1.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=61fd8e58892f88ce871f62ab015274d8
+_md5_=bf191f10143b66694a3411909f8b907f
diff --git a/metadata/md5-cache/app-portage/eix-0.31.2 b/metadata/md5-cache/app-portage/eix-0.31.2
index 5ac615fb6f92..7c779f822e17 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.2
+++ b/metadata/md5-cache/app-portage/eix-0.31.2
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.2/eix-0.31.2.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ead0cd618dac9022652dd2bf36014c63
+_md5_=bf191f10143b66694a3411909f8b907f
diff --git a/metadata/md5-cache/app-portage/eix-0.31.3 b/metadata/md5-cache/app-portage/eix-0.31.3
index 9c16503559bd..601adf06081f 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.3
+++ b/metadata/md5-cache/app-portage/eix-0.31.3
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.3/eix-0.31.3.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ead0cd618dac9022652dd2bf36014c63
+_md5_=bf191f10143b66694a3411909f8b907f
diff --git a/metadata/md5-cache/app-portage/eix-0.31.4 b/metadata/md5-cache/app-portage/eix-0.31.4
index d647eb5645bb..31aaf90eef53 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.4
+++ b/metadata/md5-cache/app-portage/eix-0.31.4
@@ -10,4 +10,4 @@ RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.4/eix-0.31.4.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3f15e0836134ad3301e78f07c2dff395
+_md5_=da03abe8f3cd3f3ede74753e5aa4ae2e
diff --git a/metadata/md5-cache/app-portage/eix-0.31.5 b/metadata/md5-cache/app-portage/eix-0.31.5
new file mode 100644
index 000000000000..2cf467d6062e
--- /dev/null
+++ b/metadata/md5-cache/app-portage/eix-0.31.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays and more
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.5/eix-0.31.5.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6e49d1295b6a9bc20a34ba6ba814feb4
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p42 b/metadata/md5-cache/app-shells/bash-4.3_p42-r1
similarity index 100%
rename from metadata/md5-cache/app-shells/bash-4.3_p42
rename to metadata/md5-cache/app-shells/bash-4.3_p42-r1
diff --git a/metadata/md5-cache/app-shells/push-1.8 b/metadata/md5-cache/app-shells/push-1.8
new file mode 100644
index 000000000000..ac014b55174e
--- /dev/null
+++ b/metadata/md5-cache/app-shells/push-1.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
+EAPI=6
+HOMEPAGE=https://github.com/vaeth/push/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/vaeth/push/archive/v1.8.tar.gz -> push-1.8.tar.gz
+_eclasses_=vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=7fcbf39a91dca5f1beea9f6020772144
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.4 b/metadata/md5-cache/app-text/xiphos-4.0.4
new file mode 100644
index 000000000000..fccc672c160e
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.7.4 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:3 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-util/intltool net-libs/biblesync virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
+EAPI=5
+HOMEPAGE=http://xiphos.org/
+IUSE=dbus debug python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.7.4 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:3 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/gnomesword/xiphos-4.0.4-20150830.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=18148201eb3aeed17e9cac26cc5d2e16
diff --git a/metadata/md5-cache/dev-db/mongodb-2.4.13 b/metadata/md5-cache/dev-db/mongodb-2.4.13
deleted file mode 100644
index 598b8574cc42..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-2.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare pretend setup test
-DEPEND=>=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools[-minimal] net-libs/libpcap app-arch/snappy ssl? ( >=dev-libs/openssl-1.0.1c ) sys-libs/readline sys-libs/ncurses kerberos? ( dev-libs/cyrus-sasl[kerberos] ) >=dev-util/scons-1.2.0 virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=4
-HOMEPAGE=http://www.mongodb.org
-IUSE=kerberos mms-agent sharedclient spidermonkey ssl static-libs
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=mms-agent? ( dev-python/pymongo app-arch/unzip )
-RDEPEND=>=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools[-minimal] net-libs/libpcap app-arch/snappy ssl? ( >=dev-libs/openssl-1.0.1c )
-SLOT=0
-SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r2.4.13.tar.gz mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	scons-utils	b7d634f772db55c8af429f50aeec6ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1bbf2bd7e43dc569d480f689c606c3c9
diff --git a/metadata/md5-cache/dev-db/mongodb-2.4.14 b/metadata/md5-cache/dev-db/mongodb-2.4.14
deleted file mode 100644
index c72722be9400..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-2.4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare pretend setup test
-DEPEND=>=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools[-minimal] net-libs/libpcap app-arch/snappy ssl? ( >=dev-libs/openssl-1.0.1c ) sys-libs/readline sys-libs/ncurses kerberos? ( dev-libs/cyrus-sasl[kerberos] ) >=dev-util/scons-1.2.0 virtual/pkgconfig
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=4
-HOMEPAGE=http://www.mongodb.org
-IUSE=kerberos mms-agent sharedclient spidermonkey ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Apache-2.0
-PDEPEND=mms-agent? ( dev-python/pymongo app-arch/unzip )
-RDEPEND=>=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools[-minimal] net-libs/libpcap app-arch/snappy ssl? ( >=dev-libs/openssl-1.0.1c )
-SLOT=0
-SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r2.4.14.tar.gz mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	scons-utils	b7d634f772db55c8af429f50aeec6ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eed2d94f0321dcba6aa1b5f1bd0f4027
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
index c6bb4401efd4..d50a19c61346 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
 IUSE=debug doc gnome-keyring python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.20:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl >=dev-lang/lua-5.1:0[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.4-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1120f9e246859a3fa21b9d08b0cbcb2b
+_md5_=f55e3b31b948f310f87b5127068c72de
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index cbe46b3364a6..afaad18f5ee9 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java
+DESCRIPTION=Java Libraries for High Performance Scientific and Technical Computing
 EAPI=5
 HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7600f377cd6e5a868ec936b4ed23c3c6
+_md5_=3e48dab0567d40e604c4fa2d8d8b1435
diff --git a/metadata/md5-cache/dev-java/guava-18.0 b/metadata/md5-cache/dev-java/guava-18.0
index 0efe5c0cb8d8..cb0e118c68a7 100644
--- a/metadata/md5-cache/dev-java/guava-18.0
+++ b/metadata/md5-cache/dev-java/guava-18.0
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of Google's core Java libraries
 EAPI=5
 HOMEPAGE=https://code.google.com/p/guava-libraries/ https://github.com/google/guava
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=18
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0-sources.jar
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a2ae20800eb5662a8745dac85691000
+_md5_=58e7da8e45388bbc8a2b73ad3d4a419c
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r1 b/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
similarity index 98%
rename from metadata/md5-cache/dev-java/icedtea-6.1.13.9-r1
rename to metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
index ec33b02ab8ea..ec6d36ac24dc 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r1
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.9.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b37-11_nov_2015.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b
-_md5_=636aa4be3fd1c4bd8e704bd253a40a1d
+_md5_=f7ca81a311b030c42b5559ffeb5bf2b3
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.6.3-r2 b/metadata/md5-cache/dev-java/icedtea-7.2.6.3-r3
similarity index 96%
rename from metadata/md5-cache/dev-java/icedtea-7.2.6.3-r2
rename to metadata/md5-cache/dev-java/icedtea-7.2.6.3-r3
index a200f3978002..a6e538cfe4ab 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.6.3-r2
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.6.3-r3
@@ -6,11 +6,11 @@ HOMEPAGE=http://icedtea.classpath.org
 IUSE=+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart elibc_FreeBSD test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7] ) nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-util/systemtap-1 media-libs/fontconfig >=media-libs/freetype-2.5.3:2=[infinality?] >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2= >=x11-libs/pango-1.24.5 ) javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu alsa? ( >=media-libs/alsa-lib-1.0 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-1.2.12 ) !headless-awt? ( >=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=test
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.3.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/openjdk.tar.bz2 -> icedtea-2.6-openjdk-f0e7f22f09ef.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/corba.tar.bz2 -> icedtea-2.6-corba-9a3ca529125a.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/jaxp.tar.bz2 -> icedtea-2.6-jaxp-f7bf82fcbd09.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/jaxws.tar.bz2 -> icedtea-2.6-jaxws-39ef53b9c403.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/jdk.tar.bz2 -> icedtea-2.6-jdk-5215185a1d57.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/hotspot.tar.bz2 -> icedtea-2.6-hotspot-c3cde6774003.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.3/langtools.tar.bz2 -> icedtea-2.6-langtools-91fdb0c83e50.tar.bz2 http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.gz -> icedtea-cacao-c182f119eaad.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0ff2fc5cc1b75d7103b050f3975cc388
+_md5_=fc113f963375d5954bb40d92895631a8
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.3-r1 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.3-r1
new file mode 100644
index 000000000000..e6a63588f3dd
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.3-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=!arm? ( dev-util/patchelf ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=5
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart
+KEYWORDS=-* ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2-with-linking-exception
+PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=dev-libs/glib-2.42:2 >=dev-libs/nss-3.16.1-r1 >=dev-libs/nspr-4.10 >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.21 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 media-libs/libpng:0/16 >=x11-libs/libX11-1.6 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=7
+SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-7.2.6.3.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-7.2.6.3.tar.xz ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.3-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.3-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.3-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.3-arm.tar.xz ) ) ppc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.3-ppc.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.3-ppc.tar.xz ) ) ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.3-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.3-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.3-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.3-x86.tar.xz ) )
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9969859171bccfd709c0894305ee35ee
diff --git a/metadata/md5-cache/dev-java/milton-api-2.5.1.5 b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
similarity index 72%
rename from metadata/md5-cache/dev-java/milton-api-2.5.1.5
rename to metadata/md5-cache/dev-java/milton-api-2.7.1.3
index 999c4a30a9c4..d5d4cef5158a 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.5.1.5
+++ b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=Milton WebDav library
 EAPI=5
 HOMEPAGE=http://milton.io
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=http://milton.io/maven/io/milton/milton-api/2.5.1.5/milton-api-2.5.1.5-sources.jar
+RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://milton.io/maven/io/milton/milton-api/2.7.1.3/milton-api-2.7.1.3-sources.jar
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=04c0a74cf0d52ede298882d2aa04185b
+_md5_=4b113867e1b33e09a913a5d02111e68e
diff --git a/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5-r1 b/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5-r1
deleted file mode 100644
index d13a92a38727..000000000000
--- a/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/milton-api:2.5 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=Milton WebDav library
-EAPI=5
-HOMEPAGE=http://milton.io
-IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/milton-api:2.5 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.5.1.5/milton-mail-api-2.5.1.5-sources.jar
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7977499b764a61b4f4eb7f8378692e2
diff --git a/metadata/md5-cache/dev-java/milton-api-2.6.5.5 b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
similarity index 54%
rename from metadata/md5-cache/dev-java/milton-api-2.6.5.5
rename to metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
index 8e4cddc834a0..9179cb0122b4 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.6.5.5
+++ b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=Milton WebDav library
 EAPI=5
 HOMEPAGE=http://milton.io
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.6
-SRC_URI=http://milton.io/maven/io/milton/milton-api/2.6.5.5/milton-api-2.6.5.5-sources.jar
+RDEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.7.1.3/milton-mail-api-2.7.1.3-sources.jar
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e8aff4b60c7e3a74822e8ec32263501
+_md5_=62d17024f249bfbce540173937e41a53
diff --git a/metadata/md5-cache/dev-lang/R-3.2.3 b/metadata/md5-cache/dev-lang/R-3.2.3
new file mode 100644
index 000000000000..46ac52648388
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/R-3.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) !<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 virtual/fortran
+DESCRIPTION=Language and environment for statistical computing and graphics
+EAPI=5
+HOMEPAGE=http://www.r-project.org/
+IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
+REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
+RESTRICT=minimal? ( test )
+SLOT=0
+SRC_URI=mirror://cran/src/base/R-3/R-3.2.3.tar.gz https://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	fortran-2	d31b3a9fd39520b0150a4fed638b369e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=54499b0901f37412fc9f1b5509b1e83c
diff --git a/metadata/md5-cache/dev-lang/moarvm-2015.12 b/metadata/md5-cache/dev-lang/moarvm-2015.12
new file mode 100644
index 000000000000..00811d276043
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2015.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libuv dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=5
+HOMEPAGE=http://moarvm.org
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libuv
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2015.12.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=592405db6485ead6ed32d3afb2f325b1
diff --git a/metadata/md5-cache/dev-lang/nqp-2015.12 b/metadata/md5-cache/dev-lang/nqp-2015.12
new file mode 100644
index 000000000000..d0ba360e8f42
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2015.12
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=parrot? ( >=dev-lang/parrot-6.7.0:=[unicode] ) java? ( >=virtual/jre-1.7 ) moar? ( =dev-lang/moarvm-2015.12 ) dev-libs/libffi java? ( >=virtual/jdk-1.7 ) dev-lang/perl
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=5
+HOMEPAGE=http://rakudo.org/
+IUSE=doc parrot java +moar
+KEYWORDS=~x86 ~amd64
+LICENSE=Artistic-2
+RDEPEND=parrot? ( >=dev-lang/parrot-6.7.0:=[unicode] ) java? ( >=virtual/jre-1.7 ) moar? ( =dev-lang/moarvm-2015.12 ) dev-libs/libffi
+REQUIRED_USE=|| ( parrot java moar )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2015.12 -> nqp-2015.12.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a30e2a54089154d8878831c19f237d18
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r3 b/metadata/md5-cache/dev-lang/python-2.7.10-r3
deleted file mode 100644
index f49d6ecaa5c9..000000000000
--- a/metadata/md5-cache/dev-lang/python-2.7.10-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=4
-HOMEPAGE=http://www.python.org/
-IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=PSF-2
-PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
-SLOT=2.7
-SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=885ff4789e1b65fb5b36c2f45c837748
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r5 b/metadata/md5-cache/dev-lang/python-2.7.10-r5
deleted file mode 100644
index a8d545562772..000000000000
--- a/metadata/md5-cache/dev-lang/python-2.7.10-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=5
-HOMEPAGE=http://www.python.org/
-IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20151117-r1 app-admin/python-updater
-RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
-SLOT=2.7
-SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f17e9c551d4e8a56e3d27cbff31f0161
diff --git a/metadata/md5-cache/dev-lang/python-2.7.11-r1 b/metadata/md5-cache/dev-lang/python-2.7.11-r2
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-2.7.11-r1
rename to metadata/md5-cache/dev-lang/python-2.7.11-r2
index d29fefd5cab7..e8e06c061fd1 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.11-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.11-r2
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libint
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz https://dev.gentoo.org/~djc/python-gentoo-patches-2.7.11-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=604ca29416a65fd023afadc9b5836e16
+_md5_=e8ca5a8c4cdb24848c4af9726b16b89b
diff --git a/metadata/md5-cache/dev-lang/python-3.3.5-r1 b/metadata/md5-cache/dev-lang/python-3.3.5-r1
deleted file mode 100644
index 7430374fc61d..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.3.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=4
-HOMEPAGE=http://www.python.org/
-IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=PSF-2
-PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 )
-SLOT=3.3
-SRC_URI=http://www.python.org/ftp/python/3.3.5/Python-3.3.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.5-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.5-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=66783383de749cdc4f21e0647a0bd01f
diff --git a/metadata/md5-cache/dev-lang/python-3.3.5-r2 b/metadata/md5-cache/dev-lang/python-3.3.5-r2
index 01ad3b299eb1..cdcde1ab95be 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.5-r2
+++ b/metadata/md5-cache/dev-lang/python-3.3.5-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
-IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 )
+RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.3 )
 SLOT=3.3
 SRC_URI=http://www.python.org/ftp/python/3.3.5/Python-3.3.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.5-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c234b229b7d33923e8b3811903ee0e6a
+_md5_=03ec29f9e1b93b499892bdc926d14293
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3 b/metadata/md5-cache/dev-lang/python-3.4.3-r1
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-3.4.3
rename to metadata/md5-cache/dev-lang/python-3.4.3-r1
index 0b611c132e68..245fabda87b9 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.3
+++ b/metadata/md5-cache/dev-lang/python-3.4.3-r1
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi vi
 SLOT=3.4
 SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=448dd9e70ec0c6bb07f5129b0b957091
+_md5_=d3472482c24ad2bcd648d27b9ac0c403
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3-r2 b/metadata/md5-cache/dev-lang/python-3.4.3-r2
deleted file mode 100644
index 5b6cea41a218..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.4.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=4
-HOMEPAGE=http://www.python.org/
-IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=PSF-2
-PDEPEND=app-eselect/eselect-python app-admin/python-updater
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
-SLOT=3.4
-SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e4e1a7b6e9d2a636c34b5d7a6eca0943
diff --git a/metadata/md5-cache/dev-lang/python-3.5.0-r1 b/metadata/md5-cache/dev-lang/python-3.5.0-r2
similarity index 98%
rename from metadata/md5-cache/dev-lang/python-3.5.0-r1
rename to metadata/md5-cache/dev-lang/python-3.5.0-r2
index f3e0b908efd3..311467bf7fe0 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.0-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.0-r2
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.5
 SRC_URI=http://www.python.org/ftp/python/3.5.0/Python-3.5.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.0-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0c5bf2603c41d42cbe4020c2b1e1c680
+_md5_=2dd38bda3cfd8736c3a5a0d5d4fcbe46
diff --git a/metadata/md5-cache/dev-lang/python-3.5.0-r5 b/metadata/md5-cache/dev-lang/python-3.5.0-r5
deleted file mode 100644
index 6a97f990f9fc..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.5.0-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=5
-HOMEPAGE=http://www.python.org/
-IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20151117-r1
-RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
-SLOT=3.5/3.5m
-SRC_URI=http://www.python.org/ftp/python/3.5.0/Python-3.5.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.0-0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=300479e251a631bb2e7160116c674e30
diff --git a/metadata/md5-cache/dev-lang/rakudo-2015.12 b/metadata/md5-cache/dev-lang/rakudo-2015.12
new file mode 100644
index 000000000000..7c7410b723e9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2015.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure test
+DEPEND==dev-lang/nqp-2015.12*:=[moar?,java?] >=dev-lang/perl-5.10
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=6
+HOMEPAGE=http://rakudo.org
+IUSE=java +moar test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND==dev-lang/nqp-2015.12*:=[moar?,java?]
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2015.12.tar.gz
+_md5_=a0f1f9a7f8a8f2ca7f54412a75d33621
diff --git a/metadata/md5-cache/dev-libs/glib-2.46.2-r1 b/metadata/md5-cache/dev-libs/glib-2.46.2-r1
index 16d82de7812f..ebd83495a6e8 100644
--- a/metadata/md5-cache/dev-libs/glib-2.46.2-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.46.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.46/glib-2.46.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=12531524cb5e5177a5b6f4157f6636e1
+_md5_=2da0b19162efb39a8464b0f9ba23c036
diff --git a/metadata/md5-cache/dev-libs/purpose-1.0 b/metadata/md5-cache/dev-libs/purpose-1.0
index eca32b9632f5..cab45687644a 100644
--- a/metadata/md5-cache/dev-libs/purpose-1.0
+++ b/metadata/md5-cache/dev-libs/purpose-1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-apps/kaccounts-integration-14.12.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/accounts-qt >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-apps/kaccounts-integration-14.12.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/accounts-qt >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-apps/kaccounts-integration-14.12.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/accounts-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-apps/kaccounts-integration-14.12.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-libs/accounts-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/purpose/purpose-1.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d99b573f4d50d42942b828d7086384e9
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
index b6c01daeb03e..d07668f6541b 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.100.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-i
 DESCRIPTION=CGI Interface for Fast CGI
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CGI-Fast/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.10.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=90807d45115653b41c34559d5646fae4
+_md5_=5930252c0b88f9c08116f72cf08f0678
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.106.0 b/metadata/md5-cache/dev-perl/Cairo-1.106.0
index ad13ba485ef4..6b7b3abcd767 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.106.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.106.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface to the cairo library
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Cairo/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=e1b330fb3aa3d6f6f77f29fe0f50bf6f
+_md5_=91c2ad011e2ede8535bc2105408e8027
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.4.2 b/metadata/md5-cache/dev-perl/DBD-Pg-3.4.2
index 93fdf9c87b35..dce95e565153 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.4.2
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.4.2
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/
 DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBD-Pg/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.4.2.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=cd3692f98a1183d394865869d6402154
+_md5_=a6504c3b6a9f9a573daf2436e5693df0
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.480.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.480.0
index 730cf3382704..23ee2f87ed19 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.480.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.480.0
@@ -4,10 +4,10 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-db/sqlite-3.6.22[extensions(+)] >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.48.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=7b31bdcc6bdfd935878b2ddc3f1be0ef
+_md5_=d8ba5f663785c329b2f3832c86224cb8
diff --git a/metadata/md5-cache/dev-perl/DBI-1.633.0 b/metadata/md5-cache/dev-perl/DBI-1.633.0
deleted file mode 100644
index 8c6b48470887..000000000000
--- a/metadata/md5-cache/dev-perl/DBI-1.633.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=The Perl DBI Module
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/DBI/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.633.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=75009b6f6ae8c0aeaec3f3f0c530b3db
diff --git a/metadata/md5-cache/dev-perl/DBI-1.634.0 b/metadata/md5-cache/dev-perl/DBI-1.634.0
index 4ed91061bc08..5730e0e73f7f 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.634.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.634.0
@@ -4,10 +4,10 @@ DESCRIPTION=Database independent interface for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBI/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.634.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=d26d333672de922f1c70d4e3d96f085c
+_md5_=d9bd63f0e088aa06e562280932ed94f0
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-0.82.50 b/metadata/md5-cache/dev-perl/DBIx-Class-0.82.50
deleted file mode 100644
index de440cc147e3..000000000000
--- a/metadata/md5-cache/dev-perl/DBIx-Class-0.82.50
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=admin? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/JSON-Any-1.220.0 >=dev-perl/MooseX-Types-JSON-0.20.0 >=dev-perl/MooseX-Types-Path-Class-0.50.0 >=dev-perl/namespace-autoclean-0.90.0 ) admin_script? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/JSON-Any-1.220.0 >=dev-perl/MooseX-Types-JSON-0.20.0 >=dev-perl/MooseX-Types-Path-Class-0.50.0 >=dev-perl/namespace-autoclean-0.90.0 >=dev-perl/Getopt-Long-Descriptive-0.81.0 >=dev-perl/Text-CSV-1.160.0 ) deploy? ( >=dev-perl/SQL-Translator-0.110.60 ) replicated? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/Hash-Merge-0.120.0 ) >=dev-perl/DBD-SQLite-1.290.0 >=dev-perl/Carp-Clan-6.00 >=dev-perl/Class-Accessor-Grouped-0.100.90 >=dev-perl/Class-C3-Componentised-1.0.900 >=dev-perl/Class-Inspector-1.240.0 >=dev-perl/Config-Any-0.200.0 dev-perl/Data-Compare >=dev-perl/Data-Page-2.10.0 >=dev-perl/DBI-1.609.0 >=dev-perl/Devel-GlobalDestruction-0.90.0 >=virtual/perl-File-Path-2.80.0 dev-perl/Hash-Merge >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Math-Base36-0.70.0 >=virtual/perl-Math-BigInt-1.80 >=dev-perl/Module-Find-0.70.0 >=dev-perl/Moo-0.1.6 >=dev-perl/Path-Class-0.180.0 >=dev-perl/SQL-Abstract-1.730.0 >=dev-perl/Sub-Name-0.40.0 >=dev-perl/Data-Dumper-Concise-2.20.0 >=dev-perl/Scope-Guard-0.30.0 dev-perl/Context-Preserve >=dev-perl/Try-Tiny-0.70.0 >=dev-perl/namespace-clean-0.240.0 test? ( >=virtual/perl-File-Temp-0.22 >=dev-perl/Package-Stash-0.280.0 >=dev-perl/Test-Exception-0.31 >=dev-perl/Test-Warn-0.21 >=virtual/perl-Test-Simple-0.94 dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Extensible and flexible object <-> relational mapper
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/DBIx-Class/
-IUSE=test admin admin_script deploy replicated
-KEYWORDS=~amd64 ~x86 ~ppc-aix
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=admin? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/JSON-Any-1.220.0 >=dev-perl/MooseX-Types-JSON-0.20.0 >=dev-perl/MooseX-Types-Path-Class-0.50.0 >=dev-perl/namespace-autoclean-0.90.0 ) admin_script? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/JSON-Any-1.220.0 >=dev-perl/MooseX-Types-JSON-0.20.0 >=dev-perl/MooseX-Types-Path-Class-0.50.0 >=dev-perl/namespace-autoclean-0.90.0 >=dev-perl/Getopt-Long-Descriptive-0.81.0 >=dev-perl/Text-CSV-1.160.0 ) deploy? ( >=dev-perl/SQL-Translator-0.110.60 ) replicated? ( >=dev-perl/Moose-0.980.0 >=dev-perl/MooseX-Types-0.210.0 >=dev-perl/Hash-Merge-0.120.0 ) >=dev-perl/DBD-SQLite-1.290.0 >=dev-perl/Carp-Clan-6.00 >=dev-perl/Class-Accessor-Grouped-0.100.90 >=dev-perl/Class-C3-Componentised-1.0.900 >=dev-perl/Class-Inspector-1.240.0 >=dev-perl/Config-Any-0.200.0 dev-perl/Data-Compare >=dev-perl/Data-Page-2.10.0 >=dev-perl/DBI-1.609.0 >=dev-perl/Devel-GlobalDestruction-0.90.0 >=virtual/perl-File-Path-2.80.0 dev-perl/Hash-Merge >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Math-Base36-0.70.0 >=virtual/perl-Math-BigInt-1.80 >=dev-perl/Module-Find-0.70.0 >=dev-perl/Moo-0.1.6 >=dev-perl/Path-Class-0.180.0 >=dev-perl/SQL-Abstract-1.730.0 >=dev-perl/Sub-Name-0.40.0 >=dev-perl/Data-Dumper-Concise-2.20.0 >=dev-perl/Scope-Guard-0.30.0 dev-perl/Context-Preserve >=dev-perl/Try-Tiny-0.70.0 >=dev-perl/namespace-clean-0.240.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-0.08205.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=c916f11d17d97c88756e12240d34036d
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
index 457f3cecba40..7c070f57d397 100644
--- a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+++ b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Digest-MD5 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-
 DESCRIPTION=Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-UUID/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=b2d1bdcce45d831ccbf93b9d0df3d30b
+_md5_=e5b45a7b5edd65f4be0559364e501f52
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.100.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.100.0
deleted file mode 100644
index 13ecdbe3aad8..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.100.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Net-Domain-TLD-1.690.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Light weight module for validating domains
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Data-Validate-Domain/
-IUSE=test
-KEYWORDS=amd64 ~hppa
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Net-Domain-TLD-1.690.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEELY/Data-Validate-Domain-0.10.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=db17acad134a4ef92d009554ba8e061c
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
index ceca7f7e1a65..46280fde7bc6 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Domain and host name validation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-Validate-Domain/
 IUSE=test
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=amd64 ~hppa
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Net-Domain-TLD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.11.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3f47446014eb403425b1ce4baac8b84c
+_md5_=ac9c19fbb295431f81323da92994a5e2
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0
index 3a6711c5e48b..707f2aafd7fc 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Strptime/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-0.450.0 >=dev-perl/DateTime-TimeZone-0.790.0 virtual/perl-Exporter >=dev-perl/Params-Validate-0.640.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.56.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=631d057224c73cb42a6c71c198587ea3
+_md5_=2816e5331af9dd1bf187246b4c361444
diff --git a/metadata/md5-cache/dev-perl/Debug-Client-0.200.0-r1 b/metadata/md5-cache/dev-perl/Debug-Client-0.200.0-r1
deleted file mode 100644
index 611d930ba923..000000000000
--- a/metadata/md5-cache/dev-perl/Debug-Client-0.200.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-perl/Test-Class-0.360.0 dev-perl/File-HomeDir >=dev-perl/PadWalker-1.920.0 >=dev-perl/Test-Deep-0.108.0 >=dev-perl/Term-ReadLine-Perl-1.30.300 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Client side code for perl debugger
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Debug-Client/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BOWTIE/Debug-Client-0.20.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=fbc6e7e6d48e7ac0e3baaf6ee7b79c3c
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.180.0 b/metadata/md5-cache/dev-perl/Devel-Cover-1.180.0
deleted file mode 100644
index 3c36c257eb51..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Cover-1.180.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Code coverage metrics for Perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-Cover/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.18.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=ba3964e5dc02fc75c764843aa1e3c1be
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.210.0 b/metadata/md5-cache/dev-perl/Devel-Cover-1.210.0
new file mode 100644
index 000000000000..48b36c81ae51
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-Cover-1.210.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Code coverage metrics for Perl
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Devel-Cover/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.21.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=efaadb496b36b560c8d1c7116650380b
diff --git a/metadata/md5-cache/dev-perl/Devel-Declare-0.6.14 b/metadata/md5-cache/dev-perl/Devel-Declare-0.6.14
deleted file mode 100644
index 71f81ca97796..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Declare-0.6.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Sub-Name virtual/perl-Scalar-List-Utils >=dev-perl/B-Hooks-OP-Check-0.190.0 dev-perl/B-Hooks-EndOfScope >=dev-perl/ExtUtils-Depends-0.302 test? ( >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Adding keywords to perl, in perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-Declare/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Sub-Name virtual/perl-Scalar-List-Utils >=dev-perl/B-Hooks-OP-Check-0.190.0 dev-perl/B-Hooks-EndOfScope dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006014.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=4fab435b015734c56dd4c449275f4c62
diff --git a/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0-r1 b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0-r1
new file mode 100644
index 000000000000..b848beb988dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.130.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 >=virtual/perl-ExtUtils-CBuilder-0.270.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Returns the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Devel-GlobalDestruction/
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.11 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.13.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=6e20573c3771fe7c064db4e0e6bf2f40
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-5.60.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-5.60.0
deleted file mode 100644
index c9c97110c06d..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-5.60.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Getopt-Long dev-perl/JSON-Any sys-libs/zlib test? ( virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.84 dev-perl/Test-Differences ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Powerful feature-rich perl source code profiler
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-NYTProf/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Getopt-Long dev-perl/JSON-Any sys-libs/zlib dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-5.06.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=a347072511a167f73d3b6b6bb8261e7e
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.10.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.10.0
deleted file mode 100644
index 6917f7472053..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-Any virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.840.0 >=dev-perl/Test-Differences-0.60.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Powerful feature-rich perl source code profiler
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-NYTProf/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-Any virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.01.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=adb6d7c5c07837a6fa61c70faaf0b2f6
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.2.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.2.0
deleted file mode 100644
index 1315ec426eb4..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.880.0 virtual/perl-parent ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Introspect overloaded operators
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-OverloadInfo/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.002.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=6035fd13caed810e409df7a914243b2b
diff --git a/metadata/md5-cache/dev-perl/Devel-PatchPerl-1.400.0 b/metadata/md5-cache/dev-perl/Devel-PatchPerl-1.400.0
new file mode 100644
index 000000000000..53c341624091
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-PatchPerl-1.400.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/File-pushd-1.0.0 virtual/perl-IO virtual/perl-MIME-Base64 dev-perl/Module-Pluggable virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Patch perl source a la Devel::PPPort's buildperl.pl
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Devel-PatchPerl/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-pushd-1.0.0 virtual/perl-IO virtual/perl-MIME-Base64 dev-perl/Module-Pluggable dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.40.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=620f8a9ca7a94911a0d385f96d7f031c
diff --git a/metadata/md5-cache/dev-perl/Devel-REPL-1.3.14-r1 b/metadata/md5-cache/dev-perl/Devel-REPL-1.3.14-r1
deleted file mode 100644
index 01268ae1a889..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-REPL-1.3.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Moose-0.740.0 >=dev-perl/MooseX-Object-Pluggable-0.0.9 >=dev-perl/MooseX-Getopt-0.180.0 dev-perl/namespace-autoclean dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-Term-ANSIColor dev-perl/App-Nopaste dev-perl/B-Keywords dev-perl/Data-Dump-Streamer dev-perl/Data-Dumper-Concise dev-perl/File-Next dev-perl/Lexical-Persistence dev-perl/Module-Refresh dev-perl/PPI dev-perl/Sys-SigAction dev-lang/perl:=[-build(-)]
-DESCRIPTION=A modern perl interactive shell
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-REPL/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Moose-0.740.0 >=dev-perl/MooseX-Object-Pluggable-0.0.9 >=dev-perl/MooseX-Getopt-0.180.0 dev-perl/namespace-autoclean dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-Term-ANSIColor dev-perl/App-Nopaste dev-perl/B-Keywords dev-perl/Data-Dump-Streamer dev-perl/Data-Dumper-Concise dev-perl/File-Next dev-perl/Lexical-Persistence dev-perl/Module-Refresh dev-perl/PPI dev-perl/Sys-SigAction dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Devel-REPL-1.003014.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=de31b4523d610c598c142f81ea14a697
diff --git a/metadata/md5-cache/dev-perl/Devel-Size-0.790.0-r1 b/metadata/md5-cache/dev-perl/Devel-Size-0.790.0-r1
deleted file mode 100644
index 72220a89da09..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Size-0.790.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl extension for finding the memory usage of Perl variables
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Devel-Size/
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.79.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=18cc1303f5a7f5afebe6fe3db12151a9
diff --git a/metadata/md5-cache/dev-perl/Email-Abstract-3.7.0 b/metadata/md5-cache/dev-perl/Email-Abstract-3.7.0
index f52c94385668..385b723a1b81 100644
--- a/metadata/md5-cache/dev-perl/Email-Abstract-3.7.0
+++ b/metadata/md5-cache/dev-perl/Email-Abstract-3.7.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MRO-Compat >=dev-perl/Email-Simple-1.91 >=dev-perl/Module-Plugga
 DESCRIPTION=unified interface to mail representations
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Email-Abstract/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MRO-Compat >=dev-perl/Email-Simple-1.91 >=dev-perl/Module-Pluggable-1.5 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.007.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=6420ac4cbd53225cf09c806c85a2d95a
+_md5_=0f57d67b1a02aa08a4cde9d0bff66996
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.908.0 b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
new file mode 100644
index 000000000000..362dc324a8f7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Encode virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Pod-1.140.0 >=dev-perl/Test-Pod-Coverage-1.80.0 ) dev-lang/perl:=
+DESCRIPTION=RFC 2822 Address Parsing and Creation
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Email-Address/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=a87fd483d6437404550d0db82393eead
diff --git a/metadata/md5-cache/dev-perl/Email-FolderType-0.813.0 b/metadata/md5-cache/dev-perl/Email-FolderType-0.813.0
deleted file mode 100644
index b56e2f47bc54..000000000000
--- a/metadata/md5-cache/dev-perl/Email-FolderType-0.813.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Pluggable dev-lang/perl:=[-build(-)]
-DESCRIPTION=Determine the type of a mail folder
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Email-FolderType/
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Module-Pluggable dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-FolderType-0.813.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=e0182284d03384e7eb498586d07c18a2
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.936.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.936.0
new file mode 100644
index 000000000000..8c03c9fb8e25
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.936.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Email-Address >=dev-perl/Email-MIME-ContentType-1.16.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.206.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 virtual/perl-Scalar-List-Utils virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=
+DESCRIPTION=Easy MIME message parsing
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Email-MIME/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Email-Address >=dev-perl/Email-MIME-ContentType-1.16.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.206.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.936.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=1467e2ce4cf043250e56c48039640ffa
diff --git a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0 b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0
new file mode 100644
index 000000000000..f5d623a392e7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 virtual/perl-File-Spec dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=
+DESCRIPTION=Generate world unique message-ids
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Email-MessageID/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=b171c1eaeeeb6393bd2af1baf00e35e9
diff --git a/metadata/md5-cache/dev-perl/Email-Reply-1.204.0 b/metadata/md5-cache/dev-perl/Email-Reply-1.204.0
new file mode 100644
index 000000000000..5356e40f9f1a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Email-Reply-1.204.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Email-Abstract-2.10.0 >=dev-perl/Email-Address-1.800.0 >=dev-perl/Email-MIME-1.820.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=Reply to a Message
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Email-Reply/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Email-Abstract-2.10.0 >=dev-perl/Email-Address-1.800.0 >=dev-perl/Email-MIME-1.820.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=f63b78c1e9367562e25d6ce917cb8fce
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-0.120.2-r1 b/metadata/md5-cache/dev-perl/Email-Sender-0.120.2-r1
deleted file mode 100644
index f3b90aabc44a..000000000000
--- a/metadata/md5-cache/dev-perl/Email-Sender-0.120.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Email-Abstract-3 dev-perl/Email-Address dev-perl/Email-Simple dev-perl/List-MoreUtils dev-perl/Net-SMTP-SSL dev-perl/Throwable dev-perl/Try-Tiny virtual/perl-libnet dev-perl/Moose >=virtual/perl-ExtUtils-MakeMaker-6.31 test? ( >=dev-perl/Capture-Tiny-0.08 >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A library for sending email
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Email-Sender/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Email-Abstract-3 dev-perl/Email-Address dev-perl/Email-Simple dev-perl/List-MoreUtils dev-perl/Net-SMTP-SSL dev-perl/Throwable dev-perl/Try-Tiny virtual/perl-libnet dev-perl/Moose dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-0.120002.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=f96816f6cb904f1eb68a6324eaac5b4b
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.11 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.11
deleted file mode 100644
index 5fcff296e65d..000000000000
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Email-Abstract-3 dev-perl/Email-Address dev-perl/Email-Simple dev-perl/List-MoreUtils dev-perl/Net-SMTP-SSL >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny virtual/perl-libnet >=dev-perl/Moo-1.0.8 dev-perl/Module-Runtime >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-ExtUtils-MakeMaker-6.31 test? ( >=dev-perl/Capture-Tiny-0.08 >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A library for sending email
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Email-Sender/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Email-Abstract-3 dev-perl/Email-Address dev-perl/Email-Simple dev-perl/List-MoreUtils dev-perl/Net-SMTP-SSL >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny virtual/perl-libnet >=dev-perl/Moo-1.0.8 dev-perl/Module-Runtime >=dev-perl/MooX-Types-MooseLike-0.150.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300011.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3025847f6fde0e2cb9b0bd397d74c911
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
index 4e121420e913..a0c522f223b3 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
@@ -4,10 +4,10 @@ DESCRIPTION=A library for sending email
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Email-Sender/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec virtual/perl-IO dev-perl/List-MoreUtils dev-perl/Module-Runtime >=dev-perl/Moo-1.0.8 >=dev-perl/MooX-Types-MooseLike-0.150.0 virtual/perl-libnet dev-perl/Net-SMTP-SSL virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3512c0dc907e53ceb27ae3253b57c4c4
+_md5_=6c3278b0a44d0b4986f37560b5aa9414
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.206 b/metadata/md5-cache/dev-perl/Email-Simple-2.206.0
similarity index 100%
rename from metadata/md5-cache/dev-perl/Email-Simple-2.206
rename to metadata/md5-cache/dev-perl/Email-Simple-2.206.0
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.208.0 b/metadata/md5-cache/dev-perl/Email-Simple-2.208.0
new file mode 100644
index 000000000000..58af2bad23e2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Email-Simple-2.208.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Email-Date-Format virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage >=virtual/perl-Test-Simple-0.960.0 virtual/perl-File-Spec ) dev-lang/perl:=
+DESCRIPTION=Simple parsing of RFC2822 message format and headers
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Email-Simple/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Email-Date-Format dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.208.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=64754d817839a916fa62f1f7e214b516
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-0.14.0 b/metadata/md5-cache/dev-perl/Module-Runtime-0.14.0
index d5fac626a3dc..b8ea9d0cc0b2 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-0.14.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Runtime module handling
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Runtime/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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 ~mips ~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-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=7b9e585b03be9eca69531b2e9a9cf5a8
+_md5_=8c71fac8fdbbc1ed29f2a3dd95130739
diff --git a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.270.0 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.270.0
deleted file mode 100644
index 7e414e202a9d..000000000000
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.270.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Moo-0.91.10 test? ( dev-perl/Set-Object >=dev-perl/Test-Fatal-0.3.0 >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Some Moosish types and a type builder
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/MooX-Types-MooseLike/
-IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Moo-0.91.10 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.27.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=7622a36b5f3c0fe9b6cf5c5f9c060a4f
diff --git a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
index bd941edf0df8..4a8f32d5f388 100644
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
+++ b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
@@ -4,10 +4,10 @@ DESCRIPTION=Some Moosish types and a type builder
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MooX-Types-MooseLike/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/strictures-2 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Moo-1.4.2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
-_md5_=bb0fcd47df7d1c1d9102fb27b6ccc4e5
+_md5_=2e34b26e3e289a4ab32e96e8b508aa23
diff --git a/metadata/md5-cache/dev-perl/Throwable-0.102.80 b/metadata/md5-cache/dev-perl/Throwable-0.102.80
deleted file mode 100644
index e4c0e26f041a..000000000000
--- a/metadata/md5-cache/dev-perl/Throwable-0.102.80
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Devel-StackTrace-1.21 >=dev-perl/Moose-0.87 >=virtual/perl-ExtUtils-MakeMaker-6.56 dev-lang/perl:=[-build(-)]
-DESCRIPTION=a role for classes that can be thrown
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Throwable/
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Devel-StackTrace-1.21 >=dev-perl/Moose-0.87 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.102080.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=9116e8c2f7386815d00299e7b25e2dcf
diff --git a/metadata/md5-cache/dev-perl/Throwable-0.200.11 b/metadata/md5-cache/dev-perl/Throwable-0.200.11
index b6e845cceb81..77ce3c9af1ec 100644
--- a/metadata/md5-cache/dev-perl/Throwable-0.200.11
+++ b/metadata/md5-cache/dev-perl/Throwable-0.200.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-p
 DESCRIPTION=A role for classes that can be thrown
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Throwable/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-perl/Moo-1.0.1 dev-perl/MooX-Types-MooseLike dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200011.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=8532e7d41c1610b4b8c236115806b081
+_md5_=d8505325fad4eaf38f39fbd1dcb66f09
diff --git a/metadata/md5-cache/dev-perl/Throwable-0.200.3-r1 b/metadata/md5-cache/dev-perl/Throwable-0.200.3-r1
deleted file mode 100644
index 7619d493fe79..000000000000
--- a/metadata/md5-cache/dev-perl/Throwable-0.200.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-perl/Moo-1.0.1 dev-perl/MooX-Types-MooseLike >=virtual/perl-ExtUtils-MakeMaker-6.56 dev-lang/perl:=[-build(-)]
-DESCRIPTION=A role for classes that can be thrown
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Throwable/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-perl/Moo-1.0.1 dev-perl/MooX-Types-MooseLike dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200003.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=d9742207f5a854286fd3a833c8fbc526
diff --git a/metadata/md5-cache/dev-perl/Throwable-0.200.4 b/metadata/md5-cache/dev-perl/Throwable-0.200.4
deleted file mode 100644
index 7d9a6f7e246c..000000000000
--- a/metadata/md5-cache/dev-perl/Throwable-0.200.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-perl/Moo-1.0.1 dev-perl/MooX-Types-MooseLike >=virtual/perl-ExtUtils-MakeMaker-6.56 dev-lang/perl:=[-build(-)]
-DESCRIPTION=A role for classes that can be thrown
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Throwable/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Devel-StackTrace-1.210.0 >=dev-perl/Moo-1.0.1 dev-perl/MooX-Types-MooseLike dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200004.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=acd7fd726c2814a5f72054abaeb6c384
diff --git a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0 b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0
deleted file mode 100644
index 46208bfa62aa..000000000000
--- a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Encapsulate SQL queries and rows in simple perl objects
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
-IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/DBIx-SearchBuilder-1.63.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=8f99d120c256a4201940dbbd44c0cf04
diff --git a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0 b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0
deleted file mode 100644
index 0c813b1b2d47..000000000000
--- a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Encapsulate SQL queries and rows in simple perl objects
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
-IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/DBIx-SearchBuilder-1.65.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=e5bab933729d15203b120cc1385b0815
diff --git a/metadata/md5-cache/dev-perl/strictures-1.4.4-r1 b/metadata/md5-cache/dev-perl/strictures-1.4.4-r1
deleted file mode 100644
index 9470730a1a06..000000000000
--- a/metadata/md5-cache/dev-perl/strictures-1.4.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Turn on strict and make all warnings fatal
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/strictures/
-KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/strictures-1.004004.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=fcfb295e86ce7b5795c45751c9a81afc
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.0 b/metadata/md5-cache/dev-perl/strictures-2.0.0
deleted file mode 100644
index 68bc3ffb3fae..000000000000
--- a/metadata/md5-cache/dev-perl/strictures-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Turn on strict and make all warnings fatal
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/strictures/
-IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000000.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=8a057d66b61d3c700eb5acacee316a4d
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.1 b/metadata/md5-cache/dev-perl/strictures-2.0.1
index 0e2d2ddbb7f9..948e0e400984 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.1
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Turn on strict and make all warnings fatal
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/strictures/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000001.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3978d29d8d2a6fee9689e0c675309481
+_md5_=3db2e74a0e52dcb7fca4d2d5e1a1d922
diff --git a/metadata/md5-cache/dev-python/autobahn-0.11.0 b/metadata/md5-cache/dev-python/autobahn-0.11.0
new file mode 100644
index 000000000000..ae2406a1505d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autobahn-0.11.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_3? ( virtual/python-asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( virtual/python-asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lz4-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/trollius-0.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/twisted-core-11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/txaio-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/ujson-1.33[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python3_3? ( virtual/python-asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( virtual/python-asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lz4-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/trollius-0.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/twisted-core-11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/txaio-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/ujson-1.33[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/autobahn/autobahn-0.11.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=44d08eb3d082a7208b1112775f826133
diff --git a/metadata/md5-cache/dev-python/bcolz-0.12.1 b/metadata/md5-cache/dev-python/bcolz-0.12.1
new file mode 100644
index 000000000000..eb22ae39d0e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bcolz-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Provides columnar and compressed data containers
+EAPI=5
+HOMEPAGE=https://github.com/Blosc/bcolz
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numexpr-1.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bcolz/bcolz-0.12.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=17a0809c2fbbf595b8c9e241bf249f98
diff --git a/metadata/md5-cache/dev-python/configargparse-0.10.0 b/metadata/md5-cache/dev-python/configargparse-0.10.0
new file mode 100644
index 000000000000..a100de93a1af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/configargparse-0.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A drop-in replacement for argparse that adds support for config files and/or environment variables
+EAPI=5
+HOMEPAGE=https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/C/ConfigArgParse/ConfigArgParse-0.10.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=011e2549698d52320ae39f9223d8c5b3
diff --git a/metadata/md5-cache/dev-python/flask-migrate-1.7.0 b/metadata/md5-cache/dev-python/flask-migrate-1.7.0
new file mode 100644
index 000000000000..235c6e02fb00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-migrate-1.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/alembic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-script[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=17921db7c8a29d86b7de1db4d1e86ee2
diff --git a/metadata/md5-cache/dev-python/flask-openid-1.2.5 b/metadata/md5-cache/dev-python/flask-openid-1.2.5
new file mode 100644
index 000000000000..698f2ef7ba2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-openid-1.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-openid-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=OpenID support for Flask
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/Flask-OpenID
+IUSE=doc examples python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-openid-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-OpenID/Flask-OpenID-1.2.5.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=60464b2fb7483484a154373fdfa3ee5c
diff --git a/metadata/md5-cache/dev-python/flask-peewee-0.6.7 b/metadata/md5-cache/dev-python/flask-peewee-0.6.7
new file mode 100644
index 000000000000..321cfdb9ba77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-peewee-0.6.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Flask integration layer for the Peewee ORM
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
+IUSE=doc examples test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/peewee[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtf-peewee[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/flask-peewee/flask-peewee-0.6.7.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=169f887808be0e01aa762ffac3a98296
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.5 b/metadata/md5-cache/dev-python/flask-restful-0.3.5
new file mode 100644
index 000000000000..1bd909df7b7f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] paging? ( >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Simple framework for creating REST APIs
+EAPI=5
+HOMEPAGE=http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/
+IUSE=doc examples paging test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] paging? ( >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.5.tar.gz -> flask-restful-0.3.5.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f0d3621f358f53f0011fdcab60ece04c
diff --git a/metadata/md5-cache/dev-python/flask-uploads-0.2.0 b/metadata/md5-cache/dev-python/flask-uploads-0.2.0
new file mode 100644
index 000000000000..f0a031abadc4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-uploads-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.5[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+DESCRIPTION=Flexible and efficient upload handling for Flask
+EAPI=5
+HOMEPAGE=http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/
+IUSE=test python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.5[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Uploads/Flask-Uploads-0.2.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=1d090a82c3c792ae601543694c2a4a7c
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.12 b/metadata/md5-cache/dev-python/frozen-flask-0.12
new file mode 100644
index 000000000000..c466b27376e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Freezes a Flask application into a set of static files
+EAPI=5
+HOMEPAGE=https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.12.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=38648f2433b5c4a61ca0ae338d098fe2
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.11 b/metadata/md5-cache/dev-python/iso8601-0.1.11
new file mode 100644
index 000000000000..7da6a525cdb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Simple module to parse ISO 8601 dates
+EAPI=5
+HOMEPAGE=https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.11.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=d2767d00bc92c7f1e29f131c7a88c232
diff --git a/metadata/md5-cache/dev-python/jonpy-0.12 b/metadata/md5-cache/dev-python/jonpy-0.12
new file mode 100644
index 000000000000..28176c17f5cf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jonpy-0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+DESCRIPTION=Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities
+EAPI=5
+HOMEPAGE=http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy
+IUSE=doc examples python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/j/jonpy/jonpy-0.12.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=89b5ef60b977ca1c8168d8993dea22fe
diff --git a/metadata/md5-cache/dev-python/logbook-0.12.3 b/metadata/md5-cache/dev-python/logbook-0.12.3
new file mode 100644
index 000000000000..dcb055f02815
--- /dev/null
+++ b/metadata/md5-cache/dev-python/logbook-0.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) doc? ( >=dev-python/sphinx-1.1.3-r3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=A logging replacement for Python
+EAPI=5
+HOMEPAGE=http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=https://github.com/mitsuhiko/logbook/archive/0.12.3.tar.gz -> logbook-0.12.3.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=36f49959005cacf27b1c0baaa5e0133a
diff --git a/metadata/md5-cache/dev-python/nevow-0.12.0 b/metadata/md5-cache/dev-python/nevow-0.12.0
new file mode 100644
index 000000000000..def04d65726f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nevow-0.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A web templating framework that provides LivePage, an automatic AJAX toolkit
+EAPI=5
+HOMEPAGE=http://divmod.org/trac/wiki/DivmodNevow https://pypi.python.org/pypi/Nevow
+IUSE=doc python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/N/Nevow/Nevow-0.12.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	twisted-r1	4fe62da548304e25cddd73dc899bf3b2	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f4d517c6d510d9a6ee0e02bc80f66d3c
diff --git a/metadata/md5-cache/dev-python/pika-0.10.0 b/metadata/md5-cache/dev-python/pika-0.10.0
new file mode 100644
index 000000000000..10d7ba93b686
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pika-0.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+DESCRIPTION=Pure-Python implementation of the AMQP
+EAPI=5
+HOMEPAGE=https://pika.readthedocs.org/ https://github.com/pika/pika
+IUSE=python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pika/pika-0.10.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=540c46d1bdd2ab2db8443cd78c2c6086
diff --git a/metadata/md5-cache/dev-python/protorpc-0.11.1 b/metadata/md5-cache/dev-python/protorpc-0.11.1
new file mode 100644
index 000000000000..8c1df6995771
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protorpc-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Google Protocol RPC
+EAPI=5
+HOMEPAGE=https://github.com/google/protorpc
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/protorpc/protorpc-0.11.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=da64ab3500b830cc6a289b1569f7c994
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.9.1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.9.1
index 5fd905d00e37..2a82c00a5dc5 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.9.1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/pytest-cache[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pytest-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( >=dev-python/pytest-2.3.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DEPEND=|| ( dev-python/pytest-cache[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pytest-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( >=dev-python/pytest-2.3.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pytest-cache[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=Manage external processes across test runs
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/pytest-xprocess/ https://bitbucket.org/pytest-dev/pytest-xprocess
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.9.1.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e80139049612de0d8d489cf737d28efa
+_md5_=25e948e08bb05742c6f29d37239c8ab6
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.5 b/metadata/md5-cache/dev-python/pyxattr-0.5.5
index c8c0c1798718..2ab947eb9ebf 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.5
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to xattr
 EAPI=5
 HOMEPAGE=http://pyxattr.k1024.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-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=LGPL-2.1
 RDEPEND=sys-apps/attr python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.5.tar.gz http://pyxattr.k1024.org/downloads/pyxattr-0.5.5.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6047d7b174144e1a1c702dc2eb803654
+_md5_=a569d39f646fc0f4cd4b8afd10e8ae9a
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.10.1 b/metadata/md5-cache/dev-python/setuptools_scm-1.10.1
index 1933da8d19ac..b6ea89d6d640 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-1.10.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=package to manage versions by scm tags via setuptools
 EAPI=5
 HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.10.1.tar.bz2
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b3a48ddce8ec7d35200243abdc1f06d9
+_md5_=948f84eb2ea9fc45999f5f34527bb639
diff --git a/metadata/md5-cache/dev-python/txaio-2.2.0 b/metadata/md5-cache/dev-python/txaio-2.2.0
new file mode 100644
index 000000000000..c8caf07b6c3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/txaio-2.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/alabaster[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytest-cov-1.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=a helper library for writing code unmodified on both Twisted and asyncio
+EAPI=5
+HOMEPAGE=https://github.com/tavendo/txaio
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/t/txaio/txaio-2.2.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=2b5886f41ed49484ebb7a4dfdb069ef0
diff --git a/metadata/md5-cache/dev-python/ujson-1.33 b/metadata/md5-cache/dev-python/ujson-1.33
index 2c335cfc9ed6..6863165ab5e9 100644
--- a/metadata/md5-cache/dev-python/ujson-1.33
+++ b/metadata/md5-cache/dev-python/ujson-1.33
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/ujson/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=amd64 arm x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.33.zip
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=688934b3587f1af223fca17330528b32
+_md5_=4c71549babd35ec994f1893f3f79be32
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.1.1 b/metadata/md5-cache/dev-python/urwidtrees-1.0.1.1
new file mode 100644
index 000000000000..f19ff999c5f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tree widgets for urwid
+EAPI=5
+HOMEPAGE=https://github.com/pazz/urwidtrees
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/u/urwidtrees/urwidtrees-1.0.1.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=def02d34ec177e8483da54305b8391aa
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.3 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.3
deleted file mode 100644
index e005e56082ff..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.3.3.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e4663df40f10faf149758fc3acac0ee2
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.4 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.4
deleted file mode 100644
index 30c02b34a7f7..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.3.4.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=82e3dbc40ca86243868a8b988158c5e2
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.8.0 b/metadata/md5-cache/dev-ruby/ethon-0.8.0
deleted file mode 100644
index 7d49f0054117..000000000000
--- a/metadata/md5-cache/dev-ruby/ethon-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/sinatra[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/mime-types[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Very lightweight libcurl wrapper
-EAPI=5
-HOMEPAGE=https://github.com/typhoeus/ethon
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/ethon-0.8.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e4ea18a1dcac37782eb2a2e084023475
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1 b/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1
new file mode 100644
index 000000000000..16802c448057
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/mime-types[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[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: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] ) )
+DESCRIPTION=Very lightweight libcurl wrapper
+EAPI=5
+HOMEPAGE=https://github.com/typhoeus/ethon
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=net-misc/curl ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.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=mirror://rubygems/ethon-0.8.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=457fb1b1fd8c99802b887ea01828e423
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2 b/metadata/md5-cache/dev-ruby/faraday-0.9.2
deleted file mode 100644
index afcfc7bec1b9..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby19] <dev-ruby/multipart-post-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] dev-ruby/sinatra[ruby_targets_ruby19] dev-ruby/net-http-persistent[ruby_targets_ruby19] dev-ruby/patron[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby20] dev-ruby/httpclient[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/net-http-persistent[ruby_targets_ruby20] dev-ruby/patron[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=HTTP/REST API client library with pluggable components
-EAPI=5
-HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby19] <dev-ruby/multipart-post-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c544a847f7a664cf3e96269fccee0487
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
new file mode 100644
index 000000000000..a27798681133
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby20] dev-ruby/httpclient[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/net-http-persistent[ruby_targets_ruby20] dev-ruby/patron[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby22] dev-ruby/httpclient[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/net-http-persistent[ruby_targets_ruby22] dev-ruby/patron[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=HTTP/REST API client library with pluggable components
+EAPI=5
+HOMEPAGE=https://github.com/lostisland/faraday
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby22] <dev-ruby/multipart-post-3[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/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bbd9f7de3765e30ab7ea521c164d53b6
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
new file mode 100644
index 000000000000..6bc67c21bac9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
@@ -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_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] ) )
+DESCRIPTION=A simple, powerful, and very fast logging utility
+EAPI=5
+HOMEPAGE=https://github.com/bdurand/lumberjack
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 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/lumberjack-1.0.10.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f7614a7fed82a24d8e10c0c305a720d7
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
deleted file mode 100644
index 6a354664c181..000000000000
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Adds a streamy multipart form post capability to Net::HTTP
-EAPI=5
-HOMEPAGE=https://github.com/nicksieger/multipart-post
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/multipart-post-2.0.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ecb62da7dc723c9c818c80b761e729e1
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
new file mode 100644
index 000000000000..e58e7fd8d432
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
@@ -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_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 a streamy multipart form post capability to Net::HTTP
+EAPI=5
+HOMEPAGE=https://github.com/nicksieger/multipart-post
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~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 )
+SLOT=0
+SRC_URI=mirror://rubygems/multipart-post-2.0.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4568d1fd06bc21a38e1152d9a636c207
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1
deleted file mode 100644
index 3455ec7c72d5..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
-EAPI=5
-HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=84b27fe08b4c903ac59c1d909fa5250b
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
new file mode 100644
index 000000000000..57042e1ab951
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] ) test? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/minitest[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_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=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
+EAPI=5
+HOMEPAGE=https://github.com/drbrain/net-http-persistent
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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_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/net-http-persistent-2.9.4.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=58768e061564a8e3719780de65ae32f5
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.0-r1 b/metadata/md5-cache/dev-ruby/ox-2.2.0-r1
deleted file mode 100644
index 5b5f3619dc67..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A fast XML parser and Object marshaller
-EAPI=5
-HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.2.0.tar.gz -> ox-2.2.0.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dde6ff86b0168014bd45c9e142eb1318
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.1 b/metadata/md5-cache/dev-ruby/ox-2.2.1
deleted file mode 100644
index f760b33f08bf..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A fast XML parser and Object marshaller
-EAPI=5
-HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.2.1.tar.gz -> ox-2.2.1.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a130970aa25ec3946b679854826ffa9
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.3 b/metadata/md5-cache/dev-ruby/ox-2.2.3
new file mode 100644
index 000000000000..2bd9a78b8055
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.2.3
@@ -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? ( 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 fast XML parser and Object marshaller
+EAPI=5
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+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=https://github.com/ohler55/ox/archive/v2.2.3.tar.gz -> ox-2.2.3.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=88ae149a4701cbae81e05006483e5137
diff --git a/metadata/md5-cache/dev-ruby/paint-0.9.0 b/metadata/md5-cache/dev-ruby/paint-0.9.0
deleted file mode 100644
index 0d2e04b7e4f0..000000000000
--- a/metadata/md5-cache/dev-ruby/paint-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Terminal painter
-EAPI=5
-HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/paint-0.9.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ae7bbc2c19c755f7c871601587e1715d
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.1 b/metadata/md5-cache/dev-ruby/paint-1.0.1
new file mode 100644
index 000000000000..d15f7c0b8f27
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.1
@@ -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_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=Terminal painter
+EAPI=5
+HOMEPAGE=https://github.com/janlelis/paint
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 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 )
+SLOT=0
+SRC_URI=https://github.com/janlelis/paint/archive/v1.0.1.tar.gz -> paint-1.0.1.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8411760ad35140c510cd91b407ab7e45
diff --git a/metadata/md5-cache/dev-ruby/patron-0.5.0 b/metadata/md5-cache/dev-ruby/patron-0.5.0
deleted file mode 100644
index 9c5c71227361..000000000000
--- a/metadata/md5-cache/dev-ruby/patron-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
-EAPI=5
-HOMEPAGE=https://toland.github.com/patron/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/patron-0.5.0.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8607234b7370b03c235aab6feae756c5
diff --git a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1 b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
new file mode 100644
index 000000000000..7df1ae3c1ea2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-misc/curl 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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_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=Patron is a Ruby HTTP client library based on libcurl
+EAPI=5
+HOMEPAGE=https://toland.github.com/patron/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=net-misc/curl 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/patron-0.5.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e527f7b413f20852678590b540bce98e
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5
deleted file mode 100644
index a6d7f889cbe0..000000000000
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=A pkg-config implementation by Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/pkg-config-1.1.5.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c639b1911e273f128e8663e0b3837379
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1
deleted file mode 100644
index b4db6ef18690..000000000000
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A pkg-config implementation by Ruby
-EAPI=5
-HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/pkg-config-1.1.5.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a631b99d890a408f0c42f7d48977663
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
index 2bda56168866..ed1bd533e538 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rcairo/pkg-config
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.6.gem
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fe6287bb97cfd4f722b6f2552df8192b
+_md5_=0a050eb4b190c6c8bb6533580e072977
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0 b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
new file mode 100644
index 000000000000..ac84c7fe056a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/chunky_png:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png: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=Library for encoding QR Codes
+EAPI=5
+HOMEPAGE=https://whomwah.github.com/rqrcode/
+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/chunky_png:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/chunky_png:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/chunky_png: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=mirror://rubygems/rqrcode-0.9.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=99ad56968bb0bf5b5a7841d91bd48505
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1
new file mode 100644
index 000000000000..3b3897a0c47d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby20? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby20] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby poppler-glib bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=app-text/poppler[cairo] ruby_targets_ruby20? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby20] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=dc5116f3fb7d00a9d0751d50d3f65a32
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.22.3 b/metadata/md5-cache/dev-ruby/webmock-1.22.3
index 5917980c67c7..4820d683847c 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.22.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.22.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] dev-ruby/hashdiff[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] dev-ruby/rspec:3[ruby_targets_ruby20] dev-ruby/rack[ruby_targets_ruby20] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby20] >=dev-ruby/patron-0.4.18[ruby_targets_ruby20] >=dev-ruby/http-0.6.0:0.6[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.6.0:0.6[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) 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] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20] >=dev-ruby/crack-0.3.2[ruby_targets_ruby20] dev-ruby/hashdiff[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby21] >=dev-ruby/crack-0.3.2[ruby_targets_ruby21] dev-ruby/hashdiff[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] dev-ruby/rspec:3[ruby_targets_ruby20] dev-ruby/rack[ruby_targets_ruby20] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby20] >=dev-ruby/patron-0.4.18[ruby_targets_ruby20] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] dev-ruby/rspec:3[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] >=dev-ruby/httpclient-2.2.4[ruby_targets_ruby21] >=dev-ruby/patron-0.4.18[ruby_targets_ruby21] >=dev-ruby/http-0.8.0:0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) 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=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=5
 HOMEPAGE=https://github.com/bblimke/webmock
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.22.3.gem
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0cd173fb674a8d9b5b4f8afe47ef8daf
+_md5_=bb456cb76bc504c4b69a68bff66cea22
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.5-r1 b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
index 4d2c68f76f4e..be6ba6bfbd36 100644
--- a/metadata/md5-cache/dev-util/checkstyle-5.5-r1
+++ b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:18 >=virtual/jdk-1.6 dev-java/ant-nodeps:0 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A development tool to help programmers write Java code that adheres to a coding standard
+DEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:18 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Development tool to help write Java code that adheres to a coding standard
 EAPI=5
 HOMEPAGE=https://github.com/checkstyle/checkstyle
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/commons-beanuti
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-5.5-src.tar.gz https://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6024ec92012235a4b36de3ca41434104
+_md5_=2e7a72a0fba42df1adc4712fbc2dfb5c
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.26 b/metadata/md5-cache/dev-util/geany-plugins-1.26
new file mode 100644
index 000000000000..b454c6f9f0ea
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-util/geany-1.26 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 dev-util/geany[-gtk3] ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) git? ( dev-libs/libgit2 ) gtkspell? ( app-text/gtkspell:2 ) lua? ( =dev-lang/lua-5.1*:= ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),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_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=5
+HOMEPAGE=http://plugins.geany.org/geany-plugins
+IUSE=+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/geany-1.26 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 dev-util/geany[-gtk3] ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) git? ( dev-libs/libgit2 ) gtkspell? ( app-text/gtkspell:2 ) lua? ( =dev-lang/lua-5.1*:= ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),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_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.26.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5f6b946917ea5dbfa60110db6492e85f
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.7.2 b/metadata/md5-cache/dev-util/kdevplatform-1.7.2
deleted file mode 100644
index c5e43bcdf51c..000000000000
--- a/metadata/md5-cache/dev-util/kdevplatform-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=KDE development support libraries and apps
-EAPI=5
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=+classbrowser cvs debug +konsole reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_kk linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test aqua
-KEYWORDS=amd64 ppc x86
-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 ) konsole? ( >=kde-apps/konsole-4.4:4[aqua=] ) cvs? ( dev-vcs/cvs ) !<dev-util/kdevelop-4.7.2:4 kde-frameworks/oxygen-icons linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) >=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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevplatform-1.7.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4696657a2294bc761af75d1b02280812
diff --git a/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1 b/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1
new file mode 100644
index 000000000000..da282fcdefd0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevplatform-1.7.2-r1
@@ -0,0 +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 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=KDE development support libraries and apps
+EAPI=5
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=+classbrowser cvs debug +konsole reviewboard subversion linguas_bs linguas_ca linguas_ca@valencia linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_kk linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW test aqua
+KEYWORDS=amd64 ppc x86
+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 ) konsole? ( || ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) ) cvs? ( dev-vcs/cvs ) !<dev-util/kdevelop-4.7.2:4 kde-frameworks/oxygen-icons linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) >=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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+RESTRICT=test
+SLOT=4
+SRC_URI=mirror://kde/stable/kdevelop/4.7.2/src/kdevplatform-1.7.2.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8014f2d953de27b0e9c144dd3093961b
diff --git a/metadata/md5-cache/dev-util/pycharm-community-4.5.3 b/metadata/md5-cache/dev-util/pycharm-community-4.5.3
deleted file mode 100644
index 1f1de7cf32cd..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-community-4.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=5
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=>=virtual/jre-1.6
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-4.5.3.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5fd6b6497b87470db3d6f93457543580
diff --git a/metadata/md5-cache/dev-util/pycharm-community-5.0.1 b/metadata/md5-cache/dev-util/pycharm-community-5.0.3
similarity index 97%
rename from metadata/md5-cache/dev-util/pycharm-community-5.0.1
rename to metadata/md5-cache/dev-util/pycharm-community-5.0.3
index d35b6882b49f..cb5a28c4ce9f 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-5.0.1
+++ b/metadata/md5-cache/dev-util/pycharm-community-5.0.3
@@ -7,6 +7,6 @@ LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
 RDEPEND=>=virtual/jre-1.6
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-5.0.1.tar.gz
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-5.0.3.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=5fd6b6497b87470db3d6f93457543580
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-4.5.2-r1 b/metadata/md5-cache/dev-util/pycharm-professional-4.5.2-r1
deleted file mode 100644
index c69d88af3cda..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-4.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=5
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.6 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-4.5.2.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7374c9b042af24be4be52e366666d0d7
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-4.5.3-r1 b/metadata/md5-cache/dev-util/pycharm-professional-4.5.3-r1
deleted file mode 100644
index 6e6d9973cdec..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-4.5.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=5
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.6 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-4.5.3.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7374c9b042af24be4be52e366666d0d7
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-5.0.1 b/metadata/md5-cache/dev-util/pycharm-professional-5.0.1
deleted file mode 100644
index f1ed57d466d9..000000000000
--- a/metadata/md5-cache/dev-util/pycharm-professional-5.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
-EAPI=5
-HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
-LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
-RDEPEND=>=virtual/jre-1.6 dev-python/pip
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-5.0.1.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7374c9b042af24be4be52e366666d0d7
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-5.0 b/metadata/md5-cache/dev-util/pycharm-professional-5.0.3
similarity index 97%
rename from metadata/md5-cache/dev-util/pycharm-professional-5.0
rename to metadata/md5-cache/dev-util/pycharm-professional-5.0.3
index fb065b26e557..baff3dfb9ded 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-5.0
+++ b/metadata/md5-cache/dev-util/pycharm-professional-5.0.3
@@ -7,6 +7,6 @@ LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Pr
 RDEPEND=>=virtual/jre-1.6 dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-professional-5.0.tar.gz
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-5.0.3.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=7374c9b042af24be4be52e366666d0d7
diff --git a/metadata/md5-cache/dev-vcs/mercurial-3.6.1 b/metadata/md5-cache/dev-vcs/mercurial-3.6.3
similarity index 94%
rename from metadata/md5-cache/dev-vcs/mercurial-3.6.1
rename to metadata/md5-cache/dev-vcs/mercurial-3.6.3
index 47ff0e7ee53d..b1d8d6945bfa 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-3.6.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-3.6.3
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://mercurial.selenic.com/release/mercurial-3.6.1.tar.gz
+SRC_URI=http://mercurial.selenic.com/release/mercurial-3.6.3.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e422944db233ffd57955d7ed7b1944d9
+_md5_=d88fd1b635988cc6937d3ed24030144f
diff --git a/metadata/md5-cache/games-action/lugaru-20151204 b/metadata/md5-cache/games-action/lugaru-20151204
index e72904197d8d..9d08d8fe3df6 100644
--- a/metadata/md5-cache/games-action/lugaru-20151204
+++ b/metadata/md5-cache/games-action/lugaru-20151204
@@ -3,10 +3,10 @@ DEPEND=virtual/glu virtual/opengl media-libs/libsdl[opengl,video] media-libs/ope
 DESCRIPTION=3D arcade with unique fighting system and anthropomorphic characters
 EAPI=5
 HOMEPAGE=https://bitbucket.org/osslugaru/lugaru/wiki/Home
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ free-noncomm CC-BY-SA-3.0
 RDEPEND=virtual/glu virtual/opengl media-libs/libsdl[opengl,video] media-libs/openal media-libs/libvorbis virtual/jpeg:0 media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/lugaru-20151204.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e348f75f26b4dd5c0e0e10500d6b68f1
+_md5_=4597470c4ff2223338e2052297b10626
diff --git a/metadata/md5-cache/games-board/freedoko-0.7.13-r1 b/metadata/md5-cache/games-board/freedoko-0.7.13-r1
index 593ca9754c2b..3cad7f868e4a 100644
--- a/metadata/md5-cache/games-board/freedoko-0.7.13-r1
+++ b/metadata/md5-cache/games-board/freedoko-0.7.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=FreeDoko is a Doppelkopf-game
 EAPI=5
 HOMEPAGE=http://free-doko.sourceforge.net
 IUSE=+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.13.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6c013038108664c2d85dcab03871f193
+_md5_=1df36510b79e0d9016fe33e0028063f5
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8 b/metadata/md5-cache/games-fps/openarena-0.8.8
index a11332e47ec9..6f885a6811d4 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
+DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg:0 x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
 DESCRIPTION=Open-source replacement for Quake 3 Arena
 EAPI=5
 HOMEPAGE=http://openarena.ws/
 IUSE=+curl +openal +vorbis
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) games-misc/games-envd
+RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg:0 x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=959df8e62fc5e83e82bd83294ab061d4
+_md5_=6f417f06f87de6e7d0f4054a540b0512
diff --git a/metadata/md5-cache/games-fps/quake3-1.36-r1 b/metadata/md5-cache/games-fps/quake3-1.36-r1
index a198ce61f8e3..b0cda1adff1d 100644
--- a/metadata/md5-cache/games-fps/quake3-1.36-r1
+++ b/metadata/md5-cache/games-fps/quake3-1.36-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) )
 DESCRIPTION=Quake III Arena - 3rd installment of the classic id 3D first-person shooter
-EAPI=2
+EAPI=5
 HOMEPAGE=http://ioquake3.org/
 IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
 KEYWORDS=amd64 ~ia64 ~ppc x86 ~x86-fbsd
@@ -10,4 +10,4 @@ RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl
 SLOT=0
 SRC_URI=http://ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=ce278e6fdaacf4796eb6ffd76fc7c6dd
+_md5_=8dc9600c25ea84c3eb567563058393fd
diff --git a/metadata/md5-cache/games-fps/quake3-9999 b/metadata/md5-cache/games-fps/quake3-9999
index d686f63b4a9c..8d91e07b1ff2 100644
--- a/metadata/md5-cache/games-fps/quake3-9999
+++ b/metadata/md5-cache/games-fps/quake3-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) dev-vcs/git
+DEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Quake III Arena - 3rd installment of the classic id 3D first-person shooter
-EAPI=2
+EAPI=5
 HOMEPAGE=http://ioquake3.org/
 IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
 LICENSE=GPL-2
-RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena ) games-misc/games-envd
+RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena ) games-misc/games-envd
 SLOT=0
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	git-2	df00117322129fb906bb0a53c3d6a020	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=2432fc3a3868836277a659a02d868f68
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	git-r3	0961ca04f93a7ae0e4c4a0b2b8c3be99	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=e2bf1b6ee7c992a229de87067e227f51
diff --git a/metadata/md5-cache/games-fps/quake3-alliance-3.3-r1 b/metadata/md5-cache/games-fps/quake3-alliance-3.3-r1
index 1ee8dcbf27f4..3d21541b28e6 100644
--- a/metadata/md5-cache/games-fps/quake3-alliance-3.3-r1
+++ b/metadata/md5-cache/games-fps/quake3-alliance-3.3-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Alliance - fast paced, off-handed grapple mod
-EAPI=2
-HOMEPAGE=http://www.planetquake.com/alliance/
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/alliance/alliance30.zip http://www.superkeff.net/mods/mods/alliance/alliance30.zip mirror://quakeunity/modifications/alliance/alliance30-33.zip http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=4c006414d2640121b025ee570a4213d0
+_md5_=636caaaa9c7b6ff25dfa369ec2072f4e
diff --git a/metadata/md5-cache/games-fps/quake3-alternatefire-2.0-r1 b/metadata/md5-cache/games-fps/quake3-alternatefire-2.0-r1
index 2157f8190f1a..a2e7a7b307e5 100644
--- a/metadata/md5-cache/games-fps/quake3-alternatefire-2.0-r1
+++ b/metadata/md5-cache/games-fps/quake3-alternatefire-2.0-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Alternate Fire - adds unique new secondary attacks to weapons
-EAPI=2
-HOMEPAGE=http://www.planetquake.com/alternatefire/
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/alternatefire/alternatefire-2.0.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=10163f71c123ca26b9c6906c3ab95759
+_md5_=9c4feebffb9c5e4c6908642a1172d272
diff --git a/metadata/md5-cache/games-fps/quake3-bfp-1.2-r1 b/metadata/md5-cache/games-fps/quake3-bfp-1.2-r1
index 4787a12758bc..c451112b5a84 100644
--- a/metadata/md5-cache/games-fps/quake3-bfp-1.2-r1
+++ b/metadata/md5-cache/games-fps/quake3-bfp-1.2-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=Quake III Bid For Power - take control of Ki-powered superheros and battle in a mostly aerial fight
-EAPI=2
-HOMEPAGE=http://www.planetquake.com/bidforpower/
+DESCRIPTION=Quake III Bid For Power - Control Ki-powered superheros and battle in the air
+EAPI=5
+HOMEPAGE=http://www.moddb.com/mods/bid-for-power
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/bidforpower/bidforpower1-2.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=bd9fcf5ee1f976420bae359ff4c4f6a0
+_md5_=826a272765952730dbd2d76ed468311f
diff --git a/metadata/md5-cache/games-fps/quake3-cpma-1.48 b/metadata/md5-cache/games-fps/quake3-cpma-1.48
index a24f3f23a32e..237b9db92c22 100644
--- a/metadata/md5-cache/games-fps/quake3-cpma-1.48
+++ b/metadata/md5-cache/games-fps/quake3-cpma-1.48
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Challenge Pro Mode Arena - advanced FPS competition mod
-EAPI=2
-HOMEPAGE=http://www.promode.org/
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=all-rights-reserved
 RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://www.slashquit.net/files/x/q3/cpma148-nomaps.zip http://www.slashquit.net/files/x/q3/cpma-mappack-full.zip
+SRC_URI=http://packages.vstone.eu/quake3/install/cpma148-nomaps.zip http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=e462bdbb3d90fa12a41c7cb50c4fc2a3
+_md5_=6255a4903dd3037cb465f5954b94f83e
diff --git a/metadata/md5-cache/games-fps/quake3-defrag-1.91.20 b/metadata/md5-cache/games-fps/quake3-defrag-1.91.20
index 93de7332cb0c..42638d73e95c 100644
--- a/metadata/md5-cache/games-fps/quake3-defrag-1.91.20
+++ b/metadata/md5-cache/games-fps/quake3-defrag-1.91.20
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Defrag - Trickjumping challenges for Quake III
-EAPI=2
+EAPI=5
 HOMEPAGE=http://cggdev.org/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://q3defrag.org/files/defrag/defrag_1.91.20.zip http://www.german-defrag.de/files/defrag/defragcpmpak01.zip http://www.german-defrag.de/files/defrag/df-extras002.zip http://www.german-defrag.de/files/defrag/defragpak1.zip http://www.german-defrag.de/files/defrag/defragpak2.zip http://www.german-defrag.de/files/defrag/defragpak3.zip http://www.german-defrag.de/files/defrag/defragpak4.zip http://www.german-defrag.de/files/defrag/defragpak5.zip http://www.german-defrag.de/files/defrag/defragpak7.zip http://www.german-defrag.de/files/defrag/defragpak8.zip http://www.german-defrag.de/files/defrag/defragpak9.zip http://www.german-defrag.de/files/defrag/defragpak10.zip http://www.german-defrag.de/files/defrag/defragpak11.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=a44163d030bd3d52bfdbf7decac2a808
+_md5_=ed5a9adaae35348f18440e1135c101f2
diff --git a/metadata/md5-cache/games-fps/quake3-defrag-1.91.21 b/metadata/md5-cache/games-fps/quake3-defrag-1.91.21
index 0c3ec8ca117b..9c2a9c9a847c 100644
--- a/metadata/md5-cache/games-fps/quake3-defrag-1.91.21
+++ b/metadata/md5-cache/games-fps/quake3-defrag-1.91.21
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Defrag - Trickjumping challenges for Quake III
-EAPI=2
+EAPI=5
 HOMEPAGE=http://cggdev.org/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=~amd64 ~ppc ~x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://q3defrag.org/files/defrag/defrag_1.91.21.zip http://www.german-defrag.de/files/defrag/defragcpmpak01.zip http://www.german-defrag.de/files/defrag/df-extras002.zip http://www.german-defrag.de/files/defrag/defragpak1.zip http://www.german-defrag.de/files/defrag/defragpak2.zip http://www.german-defrag.de/files/defrag/defragpak3.zip http://www.german-defrag.de/files/defrag/defragpak4.zip http://www.german-defrag.de/files/defrag/defragpak5.zip http://www.german-defrag.de/files/defrag/defragpak7.zip http://www.german-defrag.de/files/defrag/defragpak8.zip http://www.german-defrag.de/files/defrag/defragpak9.zip http://www.german-defrag.de/files/defrag/defragpak10.zip http://www.german-defrag.de/files/defrag/defragpak11.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=6e817fe2cda6f6363948d6180862e928
+_md5_=02f0695a74215ab8efce19505106d9da
diff --git a/metadata/md5-cache/games-fps/quake3-excessiveplus-2.2b b/metadata/md5-cache/games-fps/quake3-excessiveplus-2.2b
index b51a74728e82..5af7b38bfc2c 100644
--- a/metadata/md5-cache/games-fps/quake3-excessiveplus-2.2b
+++ b/metadata/md5-cache/games-fps/quake3-excessiveplus-2.2b
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=Quake III Excessive Plus - modification making the weapons much faster and stronger
-EAPI=2
+DESCRIPTION=Quake III Excessive Plus - Makes the weapons much faster and stronger
+EAPI=5
 HOMEPAGE=http://www.excessiveplus.net/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=~amd64 ~ppc ~x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://www.excessiveplus.net/files/release/xp-2.2b.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=cae617d997be59a22b62d30daac2bcc2
+_md5_=91a5af6d19b188e1148154f97a25480e
diff --git a/metadata/md5-cache/games-fps/quake3-excessiveplus-2.3 b/metadata/md5-cache/games-fps/quake3-excessiveplus-2.3
new file mode 100644
index 000000000000..361dfad8b33f
--- /dev/null
+++ b/metadata/md5-cache/games-fps/quake3-excessiveplus-2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Excessive Plus - Makes the weapons much faster and stronger
+EAPI=5
+HOMEPAGE=http://www.excessiveplus.net/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.excessiveplus.net/files/release/xp-2.3.zip
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=91a5af6d19b188e1148154f97a25480e
diff --git a/metadata/md5-cache/games-fps/quake3-lrctf-1.1 b/metadata/md5-cache/games-fps/quake3-lrctf-1.1
index 73b64add793f..bd629476ec7c 100644
--- a/metadata/md5-cache/games-fps/quake3-lrctf-1.1
+++ b/metadata/md5-cache/games-fps/quake3-lrctf-1.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Loki's Revenge CTF - offhand grapple all-weapons capture the flag mod
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.lrctf.com/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=~amd64 ~ppc ~x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://lrctf.com/release/LRCTF_Q3A_v1.1_full.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=301f868872c864b3ec63f4df766d9b41
+_md5_=079fcdf02f3166e3006fa72b127e8424
diff --git a/metadata/md5-cache/games-fps/quake3-matrix-2.4_beta-r1 b/metadata/md5-cache/games-fps/quake3-matrix-2.4_beta-r1
index 1a25fe8a7dba..35274cfdf669 100644
--- a/metadata/md5-cache/games-fps/quake3-matrix-2.4_beta-r1
+++ b/metadata/md5-cache/games-fps/quake3-matrix-2.4_beta-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Matrix - Matrix conversion mod
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.moddb.com/mods/matrix-quake-3
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/matrix24.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b02f19aa2be9b301bac7eae1fc533a73
+_md5_=570d317d64db428206c66b6b71b4069a
diff --git a/metadata/md5-cache/games-fps/quake3-nsco-1.93-r1 b/metadata/md5-cache/games-fps/quake3-nsco-1.93-r1
index e5f18b8944a5..f3eed0211ed9 100644
--- a/metadata/md5-cache/games-fps/quake3-nsco-1.93-r1
+++ b/metadata/md5-cache/games-fps/quake3-nsco-1.93-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Navy Seals: Covert Operations - a US Navy Seals conversion mod
-EAPI=2
-HOMEPAGE=http://ns-co.net/
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
 RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
-RESTRICT=strip mirror fetch
+RESTRICT=strip mirror
 SLOT=0
-SRC_URI=nsco_beta191a.zip nsco_beta193upd.zip
+SRC_URI=mirror://quakeunity/modifications/navyseals/nsco_beta19.zip mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=5c0c1c9e220bcb548ee87ff7b73f8d2d
+_md5_=a9e15f33da5a2b1f6fa60c87d5881c78
diff --git a/metadata/md5-cache/games-fps/quake3-osp-1.03a-r1 b/metadata/md5-cache/games-fps/quake3-osp-1.03a-r1
index 176ff2dd1f47..7d924a50de44 100644
--- a/metadata/md5-cache/games-fps/quake3-osp-1.03a-r1
+++ b/metadata/md5-cache/games-fps/quake3-osp-1.03a-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III OSP - a tournament mod
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.orangesmoothie.org/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://osp.dget.cc/orangesmoothie/downloads/osp-Quake3-1.03a_full.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=5347c8fdbb9ae63e79226e688faef0ff
+_md5_=e27d4a823257f22d401422ebc2ed17d1
diff --git a/metadata/md5-cache/games-fps/quake3-ra3-1.76-r1 b/metadata/md5-cache/games-fps/quake3-ra3-1.76-r1
index 51db73bba02d..0a3b7e7b1196 100644
--- a/metadata/md5-cache/games-fps/quake3-ra3-1.76-r1
+++ b/metadata/md5-cache/games-fps/quake3-ra3-1.76-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Rocket Arena 3 - a rocket dueling mod
-EAPI=2
-HOMEPAGE=http://www.planetquake.com/servers/arena/
+EAPI=5
+HOMEPAGE=http://www.moddb.com/mods/rocket-arena-3
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/rocketarena3/ra3176.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=e49389428e34cb91e6daba7d423b3cde
+_md5_=71cb0dfd7b6771aa69d3d3862e696d26
diff --git a/metadata/md5-cache/games-fps/quake3-reaction-3.2 b/metadata/md5-cache/games-fps/quake3-reaction-3.2
index 2a86c5b73fdd..b9d6230e25f3 100644
--- a/metadata/md5-cache/games-fps/quake3-reaction-3.2
+++ b/metadata/md5-cache/games-fps/quake3-reaction-3.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Reaction - port of Action Quake 2 to Quake 3: Arena
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.rq3.com/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=~amd64 ~ppc ~x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.1-Full.zip mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.2-Update.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0c774bd7fb5d950f87d35b91df319104
+_md5_=5bdef41e4866e459c89e4b665639ac2f
diff --git a/metadata/md5-cache/games-fps/quake3-ruinhunters-1.0a-r1 b/metadata/md5-cache/games-fps/quake3-ruinhunters-1.0a-r1
index 0acd78842b5f..4bd265da45b8 100644
--- a/metadata/md5-cache/games-fps/quake3-ruinhunters-1.0a-r1
+++ b/metadata/md5-cache/games-fps/quake3-ruinhunters-1.0a-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=Quake III Ruin Hunters - a anime/fantasy mod with cartoonish characters and arcade-like gameplay
-EAPI=2
-HOMEPAGE=http://planetquake.gamespy.com/View.php?view=Quake3.Detail&id=1824
+DESCRIPTION=Quake III Ruin Hunters - Anime mod with cartoon actors and arcade-like gameplay
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
 LICENSE=freedist
 RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip
+SRC_URI=mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=3c4ad5af8df57745dc3f8f796452dbe5
+_md5_=ba54a49257760e1cca284696ab7c53a6
diff --git a/metadata/md5-cache/games-fps/quake3-threewave-1.7-r1 b/metadata/md5-cache/games-fps/quake3-threewave-1.7-r1
index c6c2abc12bf2..659bba0794eb 100644
--- a/metadata/md5-cache/games-fps/quake3-threewave-1.7-r1
+++ b/metadata/md5-cache/games-fps/quake3-threewave-1.7-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Quake III Threewave CTF - Threewave CTF
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.threewave.com/
 IUSE=dedicated opengl dedicated opengl
 KEYWORDS=amd64 ~ppc x86
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=mirror://quakeunity/modifications/threewavectf/threewave_16_full.zip mirror://quakeunity/modifications/threewavectf/threewave_17_update.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	games-mods	926c26c3723d1136680b3196a162ff9e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=e16a500f12353a966b91e9a97aa9b976
+_md5_=e072e5b662de5a37b54fe590419c07d5
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1 b/metadata/md5-cache/games-fps/qudos-0.40.1
index e57274b9f331..23beb41eac81 100644
--- a/metadata/md5-cache/games-fps/qudos-0.40.1
+++ b/metadata/md5-cache/games-fps/qudos-0.40.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg media-libs/libogg media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
+DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
 DESCRIPTION=Enhanced Quake 2 engine
 EAPI=5
 HOMEPAGE=http://qudos.quakedev.com/
 IUSE=alsa cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg media-libs/libogg media-libs/libpng media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
+RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://qudos.quakedev.com/linux/quake2/engines/QuDos/QuDos-0.40.1-src.tar.bz2 http://qudos.quakedev.com/linux/quake2/engines/QuDos/QuDos-0.40.1.pk3
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=83ed62dd42eb6b20c723098b964707bd
+_md5_=b897b0ccdb64238e364107dc9446ae53
diff --git a/metadata/md5-cache/games-fps/red-blue-quake2-0.1 b/metadata/md5-cache/games-fps/red-blue-quake2-0.1
index 2dea49cd76d1..301a7cf14f15 100644
--- a/metadata/md5-cache/games-fps/red-blue-quake2-0.1
+++ b/metadata/md5-cache/games-fps/red-blue-quake2-0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/libX11 app-arch/unzip
 DESCRIPTION=red-blue Quake II ! play quake2 w/3d glasses !
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.jfedor.org/red-blue-quake2/
 KEYWORDS=x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/source/q2source-3.21.zip http://www.jfedor.org/red-blue-quake2/red-blue-quake2-0.1.tar.gz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=71c8b358a8f5de898d8f62550aa0cae7
+_md5_=be8140bdc8ea416087b7fbab1f95da26
diff --git a/metadata/md5-cache/games-fps/sauerbraten-2013.01.04 b/metadata/md5-cache/games-fps/sauerbraten-2013.01.04
index 9dc3e268c8dc..6d8499320359 100644
--- a/metadata/md5-cache/games-fps/sauerbraten-2013.01.04
+++ b/metadata/md5-cache/games-fps/sauerbraten-2013.01.04
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[
 SLOT=0
 SRC_URI=mirror://sourceforge/sauerbraten/sauerbraten/2013_01_04/sauerbraten_2013_01_04_collect_edition_linux.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d293d9e6235d799059ed486400268d99
+_md5_=012a5b4eff451f3ca37dc32be8346bca
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1 b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
index 0ba87f6634de..d09a6c891ae6 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57-r1
@@ -3,11 +3,11 @@ DEPEND=games-util/loki_patch
 DESCRIPTION=First-person shooter based on the mercenary trade
 EAPI=5
 HOMEPAGE=http://www.lokigames.com/products/sof/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LOKI-EULA
 RDEPEND=virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/sof-demo.run
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=048048b5e4fa7a0c8c9881b6d742ee35
+_md5_=7c00a306a0981cc486387581ed13da8d
diff --git a/metadata/md5-cache/games-fps/tenebrae-1.04 b/metadata/md5-cache/games-fps/tenebrae-1.04
index 274730f98ff4..026b91b2cd89 100644
--- a/metadata/md5-cache/games-fps/tenebrae-1.04
+++ b/metadata/md5-cache/games-fps/tenebrae-1.04
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/libpng x11-libs/libXxf86vm x11-libs/libXxf86dga x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto app-arch/unzip
+DEPEND=virtual/opengl virtual/glu media-libs/libpng:0 x11-libs/libXxf86vm x11-libs/libXxf86dga x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto app-arch/unzip
 DESCRIPTION=adds stencil shadows and per pixel lights to quake
-EAPI=2
+EAPI=5
 HOMEPAGE=http://tenebrae.sourceforge.net/
 KEYWORDS=x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/libpng x11-libs/libXxf86vm x11-libs/libXxf86dga games-misc/games-envd
+RDEPEND=virtual/opengl virtual/glu media-libs/libpng:0 x11-libs/libXxf86vm x11-libs/libXxf86dga games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/tenebrae/tenebraedata.zip mirror://gentoo/tenebrae-1.04.tbz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=d701ee447dd4e20f17e90eb3795ae776
+_md5_=283e3e439daa24cd4ea9b3b42372817c
diff --git a/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701 b/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701
index 15f0bb0f6f01..626688fab3c3 100644
--- a/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701
+++ b/metadata/md5-cache/games-misc/robotfindskitten-2.7182818.701
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0
 DESCRIPTION=Help robot find kitten
 EAPI=5
 HOMEPAGE=http://robotfindskitten.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/rfk/robotfindskitten-2.7182818.701.tar.gz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=3ea3553b87b42c4c447bdefe2c989cc0
+_md5_=546b98e86483020c2a47c8ff5685fb81
diff --git a/metadata/md5-cache/games-mud/tintin-2.01.1 b/metadata/md5-cache/games-mud/tintin-2.01.1
index d0dd01904742..c41c6203a24d 100644
--- a/metadata/md5-cache/games-mud/tintin-2.01.1
+++ b/metadata/md5-cache/games-mud/tintin-2.01.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib net-libs/gnutls dev-libs/libpcre sys-libs/readline:0
 DESCRIPTION=(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t
 EAPI=5
 HOMEPAGE=http://tintin.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib net-libs/gnutls dev-libs/libpcre sys-libs/readline:0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/tintin/tintin-2.01.1.tar.gz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=93fbbb3b072359161441d8a6fb6c43b1
+_md5_=fcb4a54185fc8e0f5bd656bfad3af822
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.6.0 b/metadata/md5-cache/games-roguelike/tomenet-4.6.0
index 5120d93d148a..9790ca7f2842 100644
--- a/metadata/md5-cache/games-roguelike/tomenet-4.6.0
+++ b/metadata/md5-cache/games-roguelike/tomenet-4.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
 EAPI=5
 HOMEPAGE=http://www.tomenet.eu/
 IUSE=dedicated server +sound X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Moria
 RDEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.tomenet.eu/downloads/tomenet-4.6.0.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=041935c7295560808fd8b7fd1871a967
+_md5_=5050215ca0dadc543833ae8ebde82136
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-0.16 b/metadata/md5-cache/games-rpg/freedroidrpg-0.16
new file mode 100644
index 000000000000..b4d7159dc17f
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-0.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=media-libs/libsdl[opengl?,sound?,video] virtual/jpeg:0 media-libs/libpng:0 media-libs/sdl-image[jpeg,png] >=media-libs/sdl-gfx-2.0.21 sound? ( media-libs/sdl-mixer[vorbis] media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) nls? ( virtual/libintl ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) 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 >=sys-apps/sed-4
+DESCRIPTION=A modification of the classical Freedroid engine into an RPG
+EAPI=5
+HOMEPAGE=http://freedroid.sourceforge.net/
+IUSE=nls opengl sound
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[opengl?,sound?,video] virtual/jpeg:0 media-libs/libpng:0 media-libs/sdl-image[jpeg,png] >=media-libs/sdl-gfx-2.0.21 sound? ( media-libs/sdl-mixer[vorbis] media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) nls? ( virtual/libintl ) games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16//freedroidRPG-0.16.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=28e6e1496d2ce215fd62fa16f3dc1d94
diff --git a/metadata/md5-cache/games-strategy/galaxyhack-1.74 b/metadata/md5-cache/games-strategy/galaxyhack-1.74
index 9ac110aad962..f0da4e380f0f 100644
--- a/metadata/md5-cache/games-strategy/galaxyhack-1.74
+++ b/metadata/md5-cache/games-strategy/galaxyhack-1.74
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[m
 DESCRIPTION=Multiplayer AI script based strategy game
 EAPI=5
 HOMEPAGE=http://galaxyhack.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 galaxyhack
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod,vorbis] >=dev-libs/boost-1.34 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=84c624b4f565e586ba130eb7f8f7c3c5
+_md5_=266f78577c2fb9a8d99fa45384b71642
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.16.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.16.2
index dd43c575bbf9..63c6b745feda 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.16.2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.16.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
 IUSE=+introspection debug test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
 SLOT=3/10
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.16/gnome-desktop-3.16.2.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=18e2a847f0081a1da3d10206c7073fb0
+_md5_=0d933070490906f049d57b1284e4086c
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
index 6aa2c7195140..8fa8d779ba61 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
 IUSE=+introspection debug test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
 SLOT=3/12
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.2.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=482d1fc785b5e0a5610c8d512b50f233
+_md5_=e640f7fb5b23c8cf4070c0ecdcda46bc
diff --git a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1 b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
index 89a4aca12e1b..a69ed0f5a92e 100644
--- a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
+++ b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test un
 DEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-base/libgnome-2.13.7 >=dev-libs/libxml2-2.4.20:2 >=gnome-base/gconf-2:2 >=x11-libs/gtk+-2.8.12:2 >=dev-libs/glib-2.6.0:2 >=gnome-base/libglade-1.99.11:2.0 >=dev-libs/popt-1.5 dev-util/gtk-doc-am x11-apps/xrdb sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=User Interface part of libbonobo
 EAPI=5
-HOMEPAGE=https://library.gnome.org/devel/libbonoboui/
+HOMEPAGE=https://developer.gnome.org/libbonoboui/
 IUSE=examples test test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-ba
 SLOT=0
 SRC_URI=mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.5.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2a4cf615e1b235ad97d74336d5f01acb
+_md5_=c3f94736b623d7108dfdcb63aea51b97
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
index 44284032c8ae..8ff60151e2b1 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) ) totem? ( media-video/totem ) || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/perl-5.8.1 >=dev-util/intltool-0.40.0 virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-devel/libtool-2.2.6 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 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) ) totem? ( media-video/totem ) || ( dev-lang/python:3.5 dev-lang/python:3.4 ) >=dev-lang/perl-5.8.1:0 >=dev-util/intltool-0.40.0:0 >=dev-libs/libltdl-2.2.6:0 virtual/pkgconfig:0 nls? ( >=sys-devel/gettext-0.18.1:0 ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/action/show/Projects/DVBDaemon
 IUSE=nls totem vala
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) ) totem? ( media-video/totem )
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) ) totem? ( media-video/totem )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=71304c868a67a265a988a881fffa2f7a
+_md5_=a8d398a301d494028a2eb457f7cc968a
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.12.2 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.12.2
deleted file mode 100644
index c62cdc89f8e5..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.0:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=dev-libs/dbus-glib-0.73 >=app-admin/packagekit-base-0.7.2[udev] >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=PackageKit client for the GNOME desktop
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/software/PackageKit/
-IUSE=nls systemd test udev test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.0:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=dev-libs/dbus-glib-0.73 >=app-admin/packagekit-base-0.7.2[udev] >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-packagekit/3.12/gnome-packagekit-3.12.2.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0b65721c430e03f71226477700c5bc59
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.18.0
new file mode 100644
index 000000000000..8e01b3031a01
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.18.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.8 >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PackageKit client for the GNOME desktop
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/software/PackageKit/
+IUSE=systemd test udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.8 >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.18/gnome-packagekit-3.18.0.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=30251cef0017cdc49911c10126c26cc2
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.18.3 b/metadata/md5-cache/gnome-extra/gnome-software-3.18.3
new file mode 100644
index 000000000000..1109e0996b37
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-software-3.18.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-admin/packagekit-base-1.0.9 dev-db/sqlite:3 >=dev-libs/appstream-glib-0.5.1:0 >=dev-libs/glib-2.45.8:2 >=gnome-base/gnome-desktop-3.17.92:3= >=gnome-base/gsettings-desktop-schemas-3.11.5 net-libs/libsoup:2.4 sys-auth/polkit >=x11-libs/gtk+-3.16:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=dev-util/intltool-0.35 virtual/pkgconfig test? ( dev-util/dogtail ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gnome install & update software
+EAPI=5
+HOMEPAGE=http://wiki.gnome.org/Apps/Software
+IUSE=test test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=app-admin/packagekit-base-1.0.9 dev-db/sqlite:3 >=dev-libs/appstream-glib-0.5.1:0 >=dev-libs/glib-2.45.8:2 >=gnome-base/gnome-desktop-3.17.92:3= >=gnome-base/gsettings-desktop-schemas-3.11.5 net-libs/libsoup:2.4 sys-auth/polkit >=x11-libs/gtk+-3.16:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/3.18/gnome-software-3.18.3.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=24324c7f018ab56edc737759008c8749
diff --git a/metadata/md5-cache/gnome-extra/gnome-web-photo-0.10.6 b/metadata/md5-cache/gnome-extra/gnome-web-photo-0.10.6
index b1442287bda8..63b0fe487e62 100644
--- a/metadata/md5-cache/gnome-extra/gnome-web-photo-0.10.6
+++ b/metadata/md5-cache/gnome-extra/gnome-web-photo-0.10.6
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=https://git.gnome.org/browse/gnome-web-photo/
 IUSE=debug
 KEYWORDS=amd64 x86
-LICENSE=GPL-2
+LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.99.3:3 >=net-libs/webkit-gtk-1.1.23:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-web-photo/0.10/gnome-web-photo-0.10.6.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eab5a9f35bdc5855eb3087625fd3054e
+_md5_=dec287e72f06be5e39819308ffd48bc5
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1 b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1
new file mode 100644
index 000000000000..8e6b99a9a75a
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) >=app-text/gnome-doc-utils-0.9 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) vala? ( || ( dev-lang/vala:0.26[vapigen(+)] ) ) !<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 java? ( >=dev-java/java-config-2.2.0 )
+DESCRIPTION=GNOME database access library
+EAPI=5
+HOMEPAGE=http://www.gnome-db.org/
+IUSE=berkdb canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala debug elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0 )
+REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
+RESTRICT=test firebird? ( bindist )
+SLOT=5/4
+SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a148b507100fbc1f0dbb3d0c79c78f43
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1
new file mode 100644
index 000000000000..785281f9253d
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-2.90.3:3[X(+)] >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A nautilus extension for sending files to locations
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-2.90.3:3[X(+)]
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.2.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=82e62828b507007d3751fa858be60c4c
diff --git a/metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r1 b/metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r1
index d6dc5024e4c1..f11f54c0696d 100644
--- a/metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r1
+++ b/metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils
 DESCRIPTION=A dbus session bus service that is used to bring up authentication dialogs
 EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/PolicyKit
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/polkit
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5b4de23e23d6ad622dd1c01fbadd0ab9
+_md5_=ec9325de83097079c3fa7e9550c6a592
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.16 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.16
index 2257f5c1f931..3b35a7841ba9 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.16
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) >=dev-util/intltool-0.35 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
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian:0=[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) >=dev-util/intltool-0.35 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=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist/
@@ -7,9 +7,9 @@ IUSE=+datahub downloads-monitor +fts icu introspection nls plugins sql-debug tel
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ LGPL-3+ GPL-2+
 PDEPEND=plugins? ( gnome-extra/zeitgeist-datasources )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian:0=[inmemory] ) icu? ( dev-libs/dee[icu?] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib )
 REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=https://launchpad.net/zeitgeist/0.9/0.9.16/+download/zeitgeist-0.9.16.tar.xz https://dev.gentoo.org/~eva/distfiles/zeitgeist/zeitgeist-0.9.16.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9031072449cbd9b38d6f63062a3e86ae
+_md5_=ed12b9de41796dfa0dfd26fd304da84c
diff --git a/metadata/md5-cache/kde-apps/ark-15.08.3-r1 b/metadata/md5-cache/kde-apps/ark-15.08.3-r1
index e8e906e22324..618520d453c6 100644
--- a/metadata/md5-cache/kde-apps/ark-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/ark-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Archiving tool
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark
 IUSE=bzip2 lzma zlib debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ark:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ark:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/ark-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d8602ec939d1571d3c8992c2913517b7
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-15.08.3 b/metadata/md5-cache/kde-apps/baloo-widgets-15.08.3
index 5a43924a1010..5217e43e54c8 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-15.08.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Widget library for baloo
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo-widgets >=kde-frameworks/kf-env-3 !kde-apps/baloo-widgets:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo-widgets >=kde-frameworks/kf-env-3 !kde-apps/baloo-widgets:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/baloo-widgets-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f113445dde295431485037057459e0a0
diff --git a/metadata/md5-cache/kde-apps/bomber-15.08.3 b/metadata/md5-cache/kde-apps/bomber-15.08.3
index b58acaeb5fcc..e15dc64be0a5 100644
--- a/metadata/md5-cache/kde-apps/bomber-15.08.3
+++ b/metadata/md5-cache/kde-apps/bomber-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE arcade bombing game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/bomber/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/bomber:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/bomber-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80d649bdecff86bde0c599ecbcb41f63
diff --git a/metadata/md5-cache/kde-apps/bovo-15.08.3 b/metadata/md5-cache/kde-apps/bovo-15.08.3
index 1b25991192e6..c594ea4e05f2 100644
--- a/metadata/md5-cache/kde-apps/bovo-15.08.3
+++ b/metadata/md5-cache/kde-apps/bovo-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Five-in-a-row Board Game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/bovo/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/bovo:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/bovo:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/bovo-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=442a4d55e5f3e6e218bba6a632641ab8
diff --git a/metadata/md5-cache/kde-apps/dolphin-15.08.3 b/metadata/md5-cache/kde-apps/dolphin-15.08.3
index 93519a00e74b..e740f2b741ef 100644
--- a/metadata/md5-cache/kde-apps/dolphin-15.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-15.08.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 >=kde-apps/baloo-widgets-15.08.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.14.0:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 >=kde-apps/baloo-widgets-15.08.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.15.0:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma filemanager focusing on usability
 EAPI=5
 HOMEPAGE=https://dolphin.kde.org https://www.kde.org/applications/system/dolphin
 IUSE=semantic-desktop thumbnail test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 >=kde-apps/baloo-widgets-15.08.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.14.0:5 ) >=kde-apps/kio-extras-15.08.3:5 thumbnail? ( >=kde-apps/ffmpegthumbs-5.9999:5 >=kde-apps/thumbnailers-5.9999:5 ) >=kde-frameworks/kf-env-3 !kde-apps/dolphin:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 >=kde-apps/baloo-widgets-15.08.3:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.15.0:5 ) >=kde-apps/kio-extras-15.08.3:5 thumbnail? ( >=kde-apps/ffmpegthumbs-5.9999:5 >=kde-apps/thumbnailers-5.9999:5 ) >=kde-frameworks/kf-env-3 !kde-apps/dolphin:4 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/dolphin-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=400f74ecc15a55b8a5d6c04d816c8a4b
diff --git a/metadata/md5-cache/kde-apps/dolphin-4.14.3-r1 b/metadata/md5-cache/kde-apps/dolphin-4.14.3-r1
new file mode 100644
index 000000000000..37a829a1f87c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-4.14.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kactivities-4.13:4[aqua=] >=kde-apps/libkonq-4.14.3:4[aqua=] media-libs/phonon[qt4] x11-libs/libXrender semantic-desktop? ( >=kde-base/baloo-4.14.3:4[aqua=] >=kde-apps/baloo-widgets-4.14.3:4[aqua=] >=kde-base/kfilemetadata-4.14.3:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DESCRIPTION=A KDE filemanager focusing on usability
+EAPI=5
+HOMEPAGE=https://dolphin.kde.org https://www.kde.org/applications/system/dolphin
+IUSE=debug semantic-desktop thumbnail +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kactivities-4.13:4[aqua=] >=kde-apps/libkonq-4.14.3:4[aqua=] media-libs/phonon[qt4] x11-libs/libXrender semantic-desktop? ( >=kde-base/baloo-4.14.3:4[aqua=] >=kde-apps/baloo-widgets-4.14.3:4[aqua=] >=kde-base/kfilemetadata-4.14.3:4[aqua=] ) >=kde-apps/kdebase-kioslaves-4.14.3:4[aqua=] >=kde-apps/kfind-4.14.3:4[aqua=] >=kde-apps/konsolepart-4.14.3:4[aqua=] thumbnail? ( >=kde-apps/thumbnailers-4.14.3:4[aqua=] || ( >=kde-apps/ffmpegthumbs-4.14.3:4[aqua=] >=kde-apps/mplayerthumbs-4.14.3:4[aqua=] ) ) !kde-base/dolphin: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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/4.14.3/src/kde-baseapps-4.14.3.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	kde4-meta	c4caa0d8e7fbcd7a667ff9240ef6e96b	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=591e1d46666ad3832940f45f6ead58e0
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-15.08.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-15.08.3
index b5242d19a6ea..6942f807bf11 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-15.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/dolphin-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/dolphin-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Dolphin plugins
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=bazaar dropbox git subversion debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/dolphin-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=kde-apps/kompare-15.08.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-3 !kde-apps/dolphin-plugins:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/dolphin-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=kde-apps/kompare-15.08.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-3 !kde-apps/dolphin-plugins:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/dolphin-plugins-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1ea99d099c9fe8200ac44b86955cd03c
diff --git a/metadata/md5-cache/kde-apps/dragon-15.08.3 b/metadata/md5-cache/kde-apps/dragon-15.08.3
index 87e65bc63afb..056f01873052 100644
--- a/metadata/md5-cache/kde-apps/dragon-15.08.3
+++ b/metadata/md5-cache/kde-apps/dragon-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A simple video player
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/dragon:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/dragon:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/dragon-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=54556d838f5cf7c6c6f1a472f16288ca
diff --git a/metadata/md5-cache/kde-apps/filelight-15.08.3 b/metadata/md5-cache/kde-apps/filelight-15.08.3
index e51c7d339c86..af113d994679 100644
--- a/metadata/md5-cache/kde-apps/filelight-15.08.3
+++ b/metadata/md5-cache/kde-apps/filelight-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
 EAPI=5
 HOMEPAGE=https://utils.kde.org/projects/filelight
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/filelight:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/filelight:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/filelight-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=de98824e64e7c647a8d670b6b63659c7
diff --git a/metadata/md5-cache/kde-apps/gpgmepp-15.08.3 b/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
index e74563bd094d..72187d7b280f 100644
--- a/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
+++ b/metadata/md5-cache/kde-apps/gpgmepp-15.08.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=app-crypt/gpgme:= dev-libs/boost >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=app-crypt/gpgme:= dev-libs/boost >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=C++ bindings for gpgme
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-crypt/gpgme:= >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/gpgmepp-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=11ad2db6412b49ebb68a19f9e9c40db9
diff --git a/metadata/md5-cache/kde-apps/granatier-15.08.3 b/metadata/md5-cache/kde-apps/granatier-15.08.3
index 7e8fbf3385e9..acafca82bb4a 100644
--- a/metadata/md5-cache/kde-apps/granatier-15.08.3
+++ b/metadata/md5-cache/kde-apps/granatier-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Bomberman game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/granatier/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/granatier:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/granatier:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/granatier-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e530a61f169cd6c79100ded4dcf70b43
diff --git a/metadata/md5-cache/kde-apps/gwenview-15.08.3-r1 b/metadata/md5-cache/kde-apps/gwenview-15.08.3-r1
index 81fbe9f03f91..e09bcd555b7c 100644
--- a/metadata/md5-cache/kde-apps/gwenview-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/gwenview-15.08.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-15.08.3:5 ) raw? ( >=kde-apps/libkdcraw-15.08.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) dev-qt/qtconcurrent:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-15.08.3:5 ) raw? ( >=kde-apps/libkdcraw-15.08.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) dev-qt/qtconcurrent:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE image viewer
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
 IUSE=kipi raw semantic-desktop X debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-15.08.3:5 ) raw? ( >=kde-apps/libkdcraw-15.08.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.14.0:5 dev-qt/qtimageformats:5 >=kde-frameworks/kf-env-3 !kde-apps/gwenview:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-15.08.3:5 ) raw? ( >=kde-apps/libkdcraw-15.08.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.15.0:5 dev-qt/qtimageformats:5 >=kde-frameworks/kf-env-3 !kde-apps/gwenview:4 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/gwenview-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63e46b20055a7b9fea2eaabf2dd45f34
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-15.08.3-r1 b/metadata/md5-cache/kde-apps/kaccounts-integration-15.08.3-r1
index ff913a99fd51..504a49fd1e07 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-15.08.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond >=kde-frameworks/kcmutils-5.14.0:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond >=kde-frameworks/kcmutils-5.15.0:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
 EAPI=5
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond >=kde-frameworks/kf-env-3 !kde-apps/kaccounts-integration:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/accounts-qt net-libs/signond >=kde-frameworks/kf-env-3 !kde-apps/kaccounts-integration:4 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kaccounts-integration-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0f8afb6e76df976e1f8cea3cb7da2736
diff --git a/metadata/md5-cache/kde-apps/kapman-15.08.3 b/metadata/md5-cache/kde-apps/kapman-15.08.3
index 536c0ea35f92..f429e4e0c2e6 100644
--- a/metadata/md5-cache/kde-apps/kapman-15.08.3
+++ b/metadata/md5-cache/kde-apps/kapman-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Pac-Man clone for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kapman/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kapman:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kapman:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kapman-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aec2a8c1280a0144e9c43720218fcfed
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-15.08.3 b/metadata/md5-cache/kde-apps/kapptemplate-15.08.3
index 8b737a34740e..52b3ef77bbfe 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-15.08.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
 IUSE=debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kapptemplate-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6d7470a645f437ba0a740ccc99aa07ea
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-15.08.3-r1 b/metadata/md5-cache/kde-apps/kapptemplate-15.08.3-r1
index be5fe3f15b5e..8b9a6ff5a7f2 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-15.08.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.17.0:5 >=kde-frameworks/kcompletion-5.17.0:5 >=kde-frameworks/kconfig-5.17.0:5 >=kde-frameworks/kconfigwidgets-5.17.0:5 >=kde-frameworks/kcoreaddons-5.17.0:5 >=kde-frameworks/ki18n-5.17.0:5 >=kde-frameworks/kio-5.17.0:5 >=kde-frameworks/kwidgetsaddons-5.17.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kapptemplate:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kapptemplate-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d69eb1d96719d778aa9952a39a262443
diff --git a/metadata/md5-cache/kde-apps/kate-15.08.3-r1 b/metadata/md5-cache/kde-apps/kate-15.08.3-r1
index 25bd613d3593..90c963c18012 100644
--- a/metadata/md5-cache/kde-apps/kate-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kate-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 addons? ( >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/threadweaver-5.14.0:5 dev-qt/qtsql:5 >=dev-libs/libgit2-0.22.0:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 addons? ( >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/threadweaver-5.15.0:5 dev-qt/qtsql:5 >=dev-libs/libgit2-0.22.0:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Kate is an advanced text editor
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/kate http://kate-editor.org
 IUSE=+addons debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 addons? ( >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/threadweaver-5.14.0:5 dev-qt/qtsql:5 >=dev-libs/libgit2-0.22.0:= ) >=kde-frameworks/kf-env-3 !kde-apps/kate:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 addons? ( >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/threadweaver-5.15.0:5 dev-qt/qtsql:5 >=dev-libs/libgit2-0.22.0:= ) >=kde-frameworks/kf-env-3 !kde-apps/kate:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kate-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=41e340aa771251e7b7818cd46211234d
diff --git a/metadata/md5-cache/kde-apps/katomic-15.08.3 b/metadata/md5-cache/kde-apps/katomic-15.08.3
index 00e42729c84d..e7a3c0dbd42b 100644
--- a/metadata/md5-cache/kde-apps/katomic-15.08.3
+++ b/metadata/md5-cache/kde-apps/katomic-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Atomic Entertainment Game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/katomic:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/katomic:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/katomic-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=230bacfcb2223de2e81e695dc74b9d82
diff --git a/metadata/md5-cache/kde-apps/kblackbox-15.08.3 b/metadata/md5-cache/kde-apps/kblackbox-15.08.3
index af3d13a98cf0..653bbb9cf07d 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-15.08.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Blackbox Game
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kblackbox:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kblackbox:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kblackbox-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dab23065ea7523f57b85c4c0c77c7a15
diff --git a/metadata/md5-cache/kde-apps/kblocks-15.08.3-r1 b/metadata/md5-cache/kde-apps/kblocks-15.08.3-r1
index c85ef12c00ba..8d3532277c30 100644
--- a/metadata/md5-cache/kde-apps/kblocks-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kblocks-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A single-player Tetris-like KDE game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kblocks/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kblocks:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] >=kde-frameworks/kf-env-3 !kde-apps/kblocks:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kblocks-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ad6dc93c2d1c1691cfee0c752929e286
diff --git a/metadata/md5-cache/kde-apps/kbounce-15.08.3 b/metadata/md5-cache/kde-apps/kbounce-15.08.3
index 6501fdec9f18..423a66a31f00 100644
--- a/metadata/md5-cache/kde-apps/kbounce-15.08.3
+++ b/metadata/md5-cache/kde-apps/kbounce-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Bounce Ball Game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kbounce:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kbounce:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kbounce-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=088270a60ed0b82643e28df6afb4236a
diff --git a/metadata/md5-cache/kde-apps/kbreakout-15.08.3 b/metadata/md5-cache/kde-apps/kbreakout-15.08.3
index 185818759ce8..21cd84ce2743 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-15.08.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A Breakout-like game for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kbreakout:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kbreakout:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kbreakout-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=482525028e0cf51d50218d62fb1ba9d9
diff --git a/metadata/md5-cache/kde-apps/kcalc-15.08.3-r1 b/metadata/md5-cache/kde-apps/kcalc-15.08.3-r1
index 136299b3939b..fab47ed4c546 100644
--- a/metadata/md5-cache/kde-apps/kcalc-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kcalc-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-libs/gmp:0 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kinit-5.14.0:5 dev-libs/mpfr:0 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-libs/gmp:0 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kinit-5.15.0:5 dev-libs/mpfr:0 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE calculator
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc
 IUSE=doc debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-libs/gmp:0 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kcalc:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-libs/gmp:0 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kcalc:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kcalc-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=93a67e3a0d960733364c5752cb77d680
diff --git a/metadata/md5-cache/kde-apps/kcharselect-15.08.3 b/metadata/md5-cache/kde-apps/kcharselect-15.08.3
index fb40d64648e7..cedb7cfec3e8 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-15.08.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE character selection utility
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
 IUSE=doc debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kcharselect:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kcharselect:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kcharselect-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=50e18c18f981070fbc1c3276dcb9e953
diff --git a/metadata/md5-cache/kde-apps/kcron-15.08.3 b/metadata/md5-cache/kde-apps/kcron-15.08.3
index aaf5a4407dc1..7f85dba18614 100644
--- a/metadata/md5-cache/kde-apps/kcron-15.08.3
+++ b/metadata/md5-cache/kde-apps/kcron-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Task Scheduler
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-3 !kde-apps/kcron:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-3 !kde-apps/kcron:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kcron-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f2e0de8e90d7e96bd7a81fc9c796c95
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-15.08.3-r1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-15.08.3-r1
index dc49fab5ea59..c5afa72b699b 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-15.08.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kdoctools-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kdoctools-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Development Scripts
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-3 !kde-apps/kde-dev-scripts:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kde-dev-scripts-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ab972218f7782f1f86790c2be612e28b
diff --git a/metadata/md5-cache/kde-apps/kde-l10n-15.08.3 b/metadata/md5-cache/kde-apps/kde-l10n-15.08.3
index 915b863f15fc..82fe7255736e 100644
--- a/metadata/md5-cache/kde-apps/kde-l10n-15.08.3
+++ b/metadata/md5-cache/kde-apps/kde-l10n-15.08.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.14.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/ki18n-5.15.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde4-l10n-15.08.3 !kde-apps/kde4-l10n[-minimal] !<kde-apps/kdepim-l10n-15.08.3 !<kde-apps/ktp-l10n-15.08.3 >=kde-frameworks/kf-env-3 !kde-apps/kde-l10n:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=linguas_ar? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz )
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bed6e2237fdc8587500b00e562462e85
diff --git a/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3 b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3
new file mode 100644
index 000000000000..ea46356ae661
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3
@@ -0,0 +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 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DESCRIPTION=KDE wallpapers
+EAPI=5
+HOMEPAGE=https://www.kde.org/
+IUSE=+minimal aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-base/kde-wallpapers: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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+SLOT=4/15.08
+SRC_URI=mirror://kde/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=28374bcdada2b1277400823dad357df8
diff --git a/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r1 b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r1
index 2a0170734f7e..fa916209fa6c 100644
--- a/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kde-wallpapers-15.08.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE wallpapers
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/kde-wallpapers:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=373f656b4f173b33247e02b2baae9ae4
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-15.08.3
index 391e67927582..f978bdd58746 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-15.08.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/jovie-15.08.3 >=kde-apps/kaccessible-15.08.3 >=kde-apps/kmag-15.08.3 >=kde-apps/kmousetool-15.08.3 >=kde-apps/kmouth-15.08.3 !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a3a2fd54fa0fb2beef26dd49600ea56
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-15.08.3
index c841adfd8559..334f04d6b285 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-15.08.3 cron? ( >=kde-apps/kcron-15.08.3 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59a709251f3986a7a5857abae8525cdf
diff --git a/metadata/md5-cache/kde-apps/kdeartwork-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdeartwork-meta-15.08.3
index 797697046721..bb687cb5cb93 100644
--- a/metadata/md5-cache/kde-apps/kdeartwork-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdeartwork-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdeartwork-colorschemes-15.08.3 >=kde-apps/kdeartwork-desktopthemes-15.08.3 >=kde-apps/kdeartwork-emoticons-15.08.3 >=kde-apps/kdeartwork-iconthemes-15.08.3 >=kde-apps/kdeartwork-kscreensaver-15.08.3 >=kde-apps/kdeartwork-wallpapers-15.08.3 >=kde-apps/kdeartwork-weatherwallpapers-15.08.3 !minimal? ( >=kde-apps/kdeartwork-styles-15.08.3 ) !kde-apps/kdeartwork-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbe327404902dba5aab92bebc155e394
diff --git a/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r1 b/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r1
index 1ab93be15e4b..c241152e37cc 100644
--- a/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdeartwork-wallpapers-15.08.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Wallpapers from kde
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -10,5 +10,5 @@ RDEPEND=!kde-apps/kdeartwork-wallpapers:4
 RESTRICT=binchecks strip
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=764d0ce3d20f77c8a19bbaa377cd3567
diff --git a/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r1 b/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r1
index 861927f91af4..112148d779c1 100644
--- a/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdeartwork-weatherwallpapers-15.08.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Weather aware wallpapers. Changes with weather outside
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdeartwork-wallpapers-15.08.3:5 !kde-apps/kdeartwork-weatherwallpapers:4
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63a9b323a614438fe4740c510e1880b8
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r1 b/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r1
deleted file mode 100644
index e12ea547c9b9..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all kdebase-derived packages
-EAPI=5
-HOMEPAGE=https://www.kde.org/
-IUSE=+display-manager minimal +wallpapers aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-4.14.3:4[aqua=] >=kde-apps/kde-base-artwork-4.14.3:4[aqua=] >=kde-apps/kdebase-runtime-meta-4.14.3:4[aqua=] >=kde-apps/kdialog-4.14.3:4[aqua=] >=kde-apps/keditbookmarks-4.14.3:4[aqua=] >=kde-apps/kfind-4.14.3:4[aqua=] >=kde-apps/kfmclient-4.14.3:4[aqua=] >=kde-apps/konq-plugins-4.14.3:4[aqua=] >=kde-apps/konqueror-4.14.3:4[aqua=] >=kde-apps/konsole-4.14.3-r1:4[aqua=] >=kde-apps/kwrite-4.14.3:4[aqua=] >=kde-apps/libkonq-4.14.3:4[aqua=] >=kde-apps/nsplugins-4.14.3:4[aqua=] >=kde-apps/phonon-kde-4.14.3:4[aqua=] wallpapers? ( || ( >=kde-apps/kde-wallpapers-4.14.3:4[aqua=] kde-apps/kde-wallpapers:5 ) ) !minimal? ( >=kde-base/freespacenotifier-4.11:4[aqua=] >=kde-base/kcheckpass-4.11.22-r1:4[aqua=] >=kde-base/kcminit-4.11:4[aqua=] >=kde-base/kdebase-cursors-4.11:4[aqua=] >=kde-base/kdebase-startkde-4.11:4[aqua=] >=kde-apps/kdepasswd-4.14.3:4[aqua=] >=kde-base/kephal-4.11:4[aqua=] >=kde-base/khotkeys-4.11:4[aqua=] >=kde-base/kinfocenter-4.11:4[aqua=] >=kde-base/klipper-4.11:4[aqua=] >=kde-base/kmenuedit-4.11:4[aqua=] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/kscreensaver-4.11:4[aqua=] >=kde-base/ksmserver-4.11:4[aqua=] >=kde-base/ksplash-4.11:4[aqua=] >=kde-base/kstartupconfig-4.11:4[aqua=] >=kde-base/kstyles-4.11:4[aqua=] >=kde-base/ksysguard-4.11:4[aqua=] >=kde-base/ksystraycmd-4.11:4[aqua=] >=kde-base/kwin-4.11:4[aqua=] >=kde-base/kwrited-4.11:4[aqua=] >=kde-base/libkworkspace-4.11:4[aqua=] >=kde-base/liboxygenstyle-4.11:4[aqua=] >=kde-base/libplasmaclock-4.11:4[aqua=] >=kde-base/libplasmagenericshell-4.11:4[aqua=] >=kde-base/libtaskmanager-4.11:4[aqua=] >=kde-apps/plasma-apps-4.14.3:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=] >=kde-base/powerdevil-4.11:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.11:4[aqua=] >=kde-base/solid-actions-kcm-4.11:4[aqua=] >=kde-base/systemsettings-4.11:4[aqua=] !prefix? ( display-manager? ( || ( >=kde-base/kdm-4.11:4[aqua=] x11-misc/lightdm x11-misc/sddm ) ) ) )
-SLOT=4
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde4-functions	ff0ade3e22b20c6dc894347fad047336	kde4-meta-pkg	97cd16869157d1165551fafffa23eedc	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=685c6459eb6e3702ae607c9a7caaded9
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r2 b/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r2
new file mode 100644
index 000000000000..f124b5929c04
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-4.14.3-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all kdebase-derived packages
+EAPI=5
+HOMEPAGE=https://www.kde.org/
+IUSE=+display-manager minimal +wallpapers aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-4.14.3:4[aqua=] >=kde-apps/kde-base-artwork-4.14.3:4[aqua=] >=kde-apps/kdebase-runtime-meta-4.14.3:4[aqua=] >=kde-apps/kdialog-4.14.3:4[aqua=] >=kde-apps/keditbookmarks-4.14.3:4[aqua=] >=kde-apps/kfind-4.14.3:4[aqua=] >=kde-apps/kfmclient-4.14.3:4[aqua=] >=kde-apps/konq-plugins-4.14.3:4[aqua=] >=kde-apps/konqueror-4.14.3:4[aqua=] >=kde-apps/konsolepart-4.14.3:4[aqua=] || ( >=kde-apps/konsole-4.14.3-r2:4[aqua=] kde-apps/konsole:5 ) >=kde-apps/kwrite-4.14.3:4[aqua=] >=kde-apps/libkonq-4.14.3:4[aqua=] >=kde-apps/nsplugins-4.14.3:4[aqua=] >=kde-apps/phonon-kde-4.14.3:4[aqua=] wallpapers? ( || ( >=kde-apps/kde-wallpapers-4.14.3:4[aqua=] kde-apps/kde-wallpapers:5 ) ) !minimal? ( >=kde-base/freespacenotifier-4.11:4[aqua=] >=kde-base/kcheckpass-4.11.22-r1:4[aqua=] >=kde-base/kcminit-4.11:4[aqua=] >=kde-base/kdebase-cursors-4.11:4[aqua=] >=kde-base/kdebase-startkde-4.11:4[aqua=] >=kde-apps/kdepasswd-4.14.3:4[aqua=] >=kde-base/kephal-4.11:4[aqua=] >=kde-base/khotkeys-4.11:4[aqua=] >=kde-base/kinfocenter-4.11:4[aqua=] >=kde-base/klipper-4.11:4[aqua=] >=kde-base/kmenuedit-4.11:4[aqua=] >=kde-base/krunner-4.11:4[aqua=] >=kde-base/kscreensaver-4.11:4[aqua=] >=kde-base/ksmserver-4.11:4[aqua=] >=kde-base/ksplash-4.11:4[aqua=] >=kde-base/kstartupconfig-4.11:4[aqua=] >=kde-base/kstyles-4.11:4[aqua=] >=kde-base/ksysguard-4.11:4[aqua=] >=kde-base/ksystraycmd-4.11:4[aqua=] >=kde-base/kwin-4.11:4[aqua=] >=kde-base/kwrited-4.11:4[aqua=] >=kde-base/libkworkspace-4.11:4[aqua=] >=kde-base/liboxygenstyle-4.11:4[aqua=] >=kde-base/libplasmaclock-4.11:4[aqua=] >=kde-base/libplasmagenericshell-4.11:4[aqua=] >=kde-base/libtaskmanager-4.11:4[aqua=] >=kde-apps/plasma-apps-4.14.3:4[aqua=] >=kde-base/plasma-workspace-4.11:4[aqua=] >=kde-base/powerdevil-4.11:4[aqua=] >=kde-base/qguiplatformplugin_kde-4.11:4[aqua=] >=kde-base/solid-actions-kcm-4.11:4[aqua=] >=kde-base/systemsettings-4.11:4[aqua=] !prefix? ( display-manager? ( || ( >=kde-base/kdm-4.11:4[aqua=] x11-misc/lightdm x11-misc/sddm ) ) ) )
+SLOT=4
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde4-functions	ff0ade3e22b20c6dc894347fad047336	kde4-meta-pkg	97cd16869157d1165551fafffa23eedc	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=dbc52c20785a10f6013a1ec4e3e3ca0e
diff --git a/metadata/md5-cache/kde-apps/kdebase-runtime-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdebase-runtime-meta-15.08.3
index f221674190b3..484234526ddb 100644
--- a/metadata/md5-cache/kde-apps/kdebase-runtime-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdebase-runtime-meta-15.08.3
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=kde-apps/kcmshell-15.08.3 >=kde-apps/kdebase-data-15.08.3 >=kde-apps/kdebase-desktoptheme-15.08.3 >=kde-apps/kdebase-menu-15.08.3 >=kde-apps/kdebase-menu-icons-15.08.3 >=kde-apps/kdebugdialog-15.08.3 >=kde-apps/kdesu-15.08.3 >=kde-apps/kdontchangethehostname-15.08.3 >=kde-apps/keditfiletype-15.08.3 >=kde-apps/kfile-15.08.3 >=kde-apps/kiconfinder-15.08.3 >=kde-apps/kimgio-15.08.3 >=kde-apps/kioclient-15.08.3 >=kde-apps/kmimetypefinder-15.08.3 >=kde-apps/knewstuff-15.08.3 >=kde-apps/knotify-15.08.3 >=kde-apps/kpasswdserver-15.08.3 >=kde-apps/kquitapp-15.08.3 >=kde-apps/kreadconfig-15.08.3 >=kde-apps/kstart-15.08.3 >=kde-apps/ktimezoned-15.08.3 >=kde-apps/ktraderclient-15.08.3 >=kde-apps/kurifilter-plugins-15.08.3 >=kde-apps/phonon-kde-15.08.3 >=kde-apps/plasma-runtime-15.08.3 >=kde-apps/renamedlg-plugins-15.08.3 >=kde-apps/solid-runtime-15.08.3 crash-reporter? ( >=kde-apps/drkonqi-15.08.3 ) minimal? ( >=kde-apps/solid-runtime-15.08.3[-bluetooth] oldwallet? ( >=kde-apps/kwalletd-15.08.3 ) ) !minimal? ( >=kde-apps/attica-15.08.3 >=kde-apps/kcontrol-15.08.3 >=kde-apps/kdebase-kioslaves-15.08.3 >=kde-apps/kglobalaccel-15.08.3 >=kde-apps/knetattach-15.08.3 >=kde-apps/kuiserver-15.08.3 >=kde-apps/kwalletd-15.08.3 ) !kde-apps/kdebase-runtime-meta:4
 REQUIRED_USE=minimal? ( !crash-reporter )
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0cb18d11e0adacc7f9d246818d34e929
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdegames-meta-15.08.3
index 05d24dd3e0c7..dbeffa46f198 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-15.08.3 >=kde-apps/bovo-15.08.3 >=kde-apps/granatier-15.08.3 >=kde-apps/kapman-15.08.3 >=kde-apps/katomic-15.08.3 >=kde-apps/kblackbox-15.08.3 >=kde-apps/kblocks-15.08.3 >=kde-apps/kbounce-15.08.3 >=kde-apps/kbreakout-15.08.3 >=kde-apps/kdiamond-15.08.3 >=kde-apps/kfourinline-15.08.3 >=kde-apps/kgoldrunner-15.08.3 >=kde-apps/kigo-15.08.3 >=kde-apps/killbots-15.08.3 >=kde-apps/kiriki-15.08.3 >=kde-apps/kjumpingcube-15.08.3 >=kde-apps/klickety-15.08.3 >=kde-apps/klines-15.08.3 >=kde-apps/kmahjongg-15.08.3 >=kde-apps/kmines-15.08.3 >=kde-apps/knavalbattle-15.08.3 >=kde-apps/knetwalk-15.08.3 >=kde-apps/kolf-15.08.3 >=kde-apps/kollision-15.08.3 >=kde-apps/konquest-15.08.3 >=kde-apps/kpat-15.08.3 >=kde-apps/kreversi-15.08.3 >=kde-apps/kshisen-15.08.3 >=kde-apps/ksirk-15.08.3 >=kde-apps/ksnakeduel-15.08.3 >=kde-apps/kspaceduel-15.08.3 >=kde-apps/ksquares-15.08.3 >=kde-apps/ktuberling-15.08.3 >=kde-apps/libkdegames-15.08.3 >=kde-apps/libkmahjongg-15.08.3 >=kde-apps/lskat-15.08.3 >=kde-apps/palapeli-15.08.3 >=kde-apps/picmi-15.08.3 opengl? ( >=kde-apps/ksudoku-15.08.3 >=kde-apps/kubrick-15.08.3 ) python? ( >=kde-apps/kajongg-15.08.3 ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=213bcc5ac7708f027f95d7ce4bfa3d76
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-15.08.3
index a5f6bea97cdc..712e5c60c1b6 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-15.08.3 >=kde-apps/kamera-15.08.3 >=kde-apps/kcolorchooser-15.08.3 >=kde-apps/kdegraphics-mobipocket-15.08.3 >=kde-apps/kolourpaint-15.08.3 >=kde-apps/kruler-15.08.3 || ( >=kde-apps/ksnapshot-15.08.3 >=kde-apps/spectacle-2.0.0 ) >=kde-apps/libkdcraw-15.08.3 >=kde-apps/libkexiv2-15.08.3 >=kde-apps/libkipi-15.08.3 >=kde-apps/okular-15.08.3 >=kde-apps/svgpart-15.08.3 >=kde-apps/thumbnailers-15.08.3 scanner? ( >=kde-apps/ksaneplugin-15.08.3 >=kde-apps/libksane-15.08.3 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=375f1b538ded558451ce9d1433567ea4
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-15.08.3
index 1b1d1773eb67..1ed32ff27527 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/audiocd-kio-15.08.3 >=kde-apps/dragon-15.08.3 >=kde-apps/juk-15.08.3 >=kde-apps/kdenlive-15.08.3 >=kde-apps/kmix-15.08.3 >=kde-apps/kscd-15.08.3 >=kde-apps/libkcddb-15.08.3 >=kde-apps/libkcompactdisc-15.08.3 mplayer? ( >=kde-apps/mplayerthumbs-15.08.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-15.08.3 ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5595211983b93b74cf29234cf1a3d71
diff --git a/metadata/md5-cache/kde-apps/kdenlive-15.08.3-r1 b/metadata/md5-cache/kde-apps/kdenlive-15.08.3-r1
index 4f1de049c086..a40c51b71741 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdenlive-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kplotting-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kplotting-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Non-linear video editing suite by KDE
 EAPI=5
 HOMEPAGE=https://www.kdenlive.org/
 IUSE=v4l debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kplotting-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-3 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kplotting-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-3 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdenlive-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dbab2a20e4029b205121aeabf2b1e4f4
diff --git a/metadata/md5-cache/kde-apps/kdenlive-15.12.0-r1 b/metadata/md5-cache/kde-apps/kdenlive-15.12.0-r1
index 97174fad877a..1692ac3c11f1 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-15.12.0-r1
+++ b/metadata/md5-cache/kde-apps/kdenlive-15.12.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kplotting-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kplotting-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Non-linear video editing suite by KDE
 EAPI=5
 HOMEPAGE=https://www.kdenlive.org/
 IUSE=v4l debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kplotting-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-3 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kplotting-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-3 !kde-apps/kdenlive:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.12.0/src/kdenlive-15.12.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef24b39694bfa268e6bc6820a1be04dc
diff --git a/metadata/md5-cache/kde-apps/kdepim-l10n-15.08.3 b/metadata/md5-cache/kde-apps/kdepim-l10n-15.08.3
index 4b49e77c05bc..06ad9c6d5389 100644
--- a/metadata/md5-cache/kde-apps/kdepim-l10n-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-l10n-15.08.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.14.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/ki18n-5.15.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE PIM internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
@@ -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 >=kde-frameworks/kf-env-3 !kde-apps/kdepim-l10n:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=linguas_ar? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz )
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=64590728bb9f0351cf1f8d5270faee01
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-15.08.3
index e564af5b960c..454037a05193 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-15.08.3 >=kde-apps/kapptemplate-15.08.3 >=kde-apps/kate-15.08.3 >=kde-apps/kcachegrind-15.08.3 >=kde-apps/kde-dev-scripts-15.08.3 >=kde-apps/kde-dev-utils-15.08.3 >=kde-apps/kdesdk-kioslaves-15.08.3 >=kde-apps/kompare-15.08.3 >=kde-apps/libkomparediff2-15.08.3 >=kde-apps/lokalize-15.08.3 >=kde-apps/okteta-15.08.3 >=kde-apps/poxml-15.08.3 >=kde-apps/umbrello-15.08.3 cvs? ( >=kde-apps/cervisia-15.08.3 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6109b6910938c230112932ae9c5b397
diff --git a/metadata/md5-cache/kde-apps/kdetoys-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdetoys-meta-15.08.3
index 7f54a81b66c9..62cdd4b23d56 100644
--- a/metadata/md5-cache/kde-apps/kdetoys-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdetoys-meta-15.08.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/amor-15.08.3 >=kde-apps/ktux-15.08.3 !kde-apps/kdetoys-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b36104ef8e81f6bb01b577ec3a5d81eb
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-15.08.3
index 1bc285c017e9..cadb64988b23 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-15.08.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-15.08.3 >=kde-apps/filelight-15.08.3 >=kde-apps/kcalc-15.08.3 >=kde-apps/kcharselect-15.08.3 >=kde-apps/kdf-15.08.3 >=kde-apps/kteatime-15.08.3 >=kde-apps/ktimer-15.08.3 >=kde-apps/kwalletmanager-15.08.3 >=kde-apps/superkaramba-15.08.3 >=kde-apps/sweeper-15.08.3 cups? ( >=kde-apps/print-manager-15.08.3 ) floppy? ( >=kde-apps/kfloppy-15.08.3 ) lirc? ( >=kde-apps/kremotecontrol-15.08.3 ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a09a2977b309a30cf03cf6bb801ae0b1
diff --git a/metadata/md5-cache/kde-apps/kdewebdev-meta-15.08.3 b/metadata/md5-cache/kde-apps/kdewebdev-meta-15.08.3
index cc1c8653ecce..c6a94bd9a0cf 100644
--- a/metadata/md5-cache/kde-apps/kdewebdev-meta-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdewebdev-meta-15.08.3
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kfilereplace-15.08.3 >=kde-apps/kimagemapeditor-15.08.3 >=kde-apps/kommander-15.08.3 !kde-apps/kdewebdev-meta:4
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	kde5-meta-pkg	c6e74f0a7a02a16639c5a863fe7df50c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4755ce9c022f8295369c27e53661dce4
diff --git a/metadata/md5-cache/kde-apps/kdiamond-15.08.3 b/metadata/md5-cache/kde-apps/kdiamond-15.08.3
index c57fb61d8a4b..d218fa8c30ea 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-15.08.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A KDE three-in-a-row game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kdiamond:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kdiamond:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kdiamond-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=299468300492b89a5bf07f5c84291347
diff --git a/metadata/md5-cache/kde-apps/kfourinline-15.08.3-r1 b/metadata/md5-cache/kde-apps/kfourinline-15.08.3-r1
index 9bd468b11351..75e47d45600d 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kfourinline-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE four-in-a-row game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kfourinline:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kfourinline:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kfourinline-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1120a514b2160423be4844cac4c5dee
diff --git a/metadata/md5-cache/kde-apps/killbots-15.08.3 b/metadata/md5-cache/kde-apps/killbots-15.08.3
index dee89bd1695a..8b24a71d544c 100644
--- a/metadata/md5-cache/kde-apps/killbots-15.08.3
+++ b/metadata/md5-cache/kde-apps/killbots-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Kill the bots or they kill you!
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/killbots/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/killbots:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/killbots:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/killbots-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9daefe1dc73cb884a4e3d804abfd45f6
diff --git a/metadata/md5-cache/kde-apps/kio-extras-15.08.3 b/metadata/md5-cache/kde-apps/kio-extras-15.08.3
index 8b61936645e3..7d409088cd64 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-15.08.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-15.08.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kio-extras
 IUSE=exif mtp phonon samba +sftp slp test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) >=kde-frameworks/kded-5.14.0:5 !<kde-apps/kcontrol-15.08.0-r1:4 >=kde-frameworks/kf-env-3 !kde-apps/kio-extras:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) >=kde-frameworks/kded-5.15.0:5 !<kde-apps/kcontrol-15.08.0-r1:4 >=kde-frameworks/kf-env-3 !kde-apps/kio-extras:4 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kio-extras-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1016b014a860cef49b5c9c9a2d8ed029
diff --git a/metadata/md5-cache/kde-apps/kiriki-15.08.3 b/metadata/md5-cache/kde-apps/kiriki-15.08.3
index 0125dbbd84c8..14120c258db6 100644
--- a/metadata/md5-cache/kde-apps/kiriki-15.08.3
+++ b/metadata/md5-cache/kde-apps/kiriki-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A gtali clone
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kiriki:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kiriki:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kiriki-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4a2f5f4c59ae886b25088bb7031b7bf4
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-15.08.3 b/metadata/md5-cache/kde-apps/kjumpingcube-15.08.3
index 93146bd91470..92c376bf266d 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-15.08.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tactical one or two player game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kjumpingcube:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kjumpingcube:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kjumpingcube-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=91cc7cde2c932ce8caa23910495a92de
diff --git a/metadata/md5-cache/kde-apps/klines-15.08.3 b/metadata/md5-cache/kde-apps/klines-15.08.3
index 54a5aee0557c..850dcd5624c7 100644
--- a/metadata/md5-cache/kde-apps/klines-15.08.3
+++ b/metadata/md5-cache/kde-apps/klines-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A little KDE game about balls and how to get rid of them
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/klines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/klines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/klines-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=87cf1c82826d2264ec99f1b53679d489
diff --git a/metadata/md5-cache/kde-apps/kmines-15.08.3 b/metadata/md5-cache/kde-apps/kmines-15.08.3
index acf252e51bf2..4a9f576dffc7 100644
--- a/metadata/md5-cache/kde-apps/kmines-15.08.3
+++ b/metadata/md5-cache/kde-apps/kmines-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Classic mine sweeper game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
 IUSE=phonon debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kmines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kmines:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kmines-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fb397c84542c4ec659d90debc7c29b00
diff --git a/metadata/md5-cache/kde-apps/kmix-15.08.3 b/metadata/md5-cache/kde-apps/kmix-15.08.3
index ac98e6e24a6b..c2f3e40851c4 100644
--- a/metadata/md5-cache/kde-apps/kmix-15.08.3
+++ b/metadata/md5-cache/kde-apps/kmix-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma mixer gui
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
 IUSE=alsa pulseaudio debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kmix:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.4.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kmix:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kmix-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9612655f46904f063c43b6addcf63e83
diff --git a/metadata/md5-cache/kde-apps/knetwalk-15.08.3 b/metadata/md5-cache/kde-apps/knetwalk-15.08.3
index 832d9703927a..cad540df30a1 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-15.08.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE version of the popular NetWalk game for system administrators
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
 IUSE=test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/knetwalk:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/knetwalk:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/knetwalk-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=621d04e7d06ee32d7d8704f6e1bffdbd
diff --git a/metadata/md5-cache/kde-apps/kollision-15.08.3 b/metadata/md5-cache/kde-apps/kollision-15.08.3
index ea5fe2bafaa9..1d11e4c438f3 100644
--- a/metadata/md5-cache/kde-apps/kollision-15.08.3
+++ b/metadata/md5-cache/kde-apps/kollision-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple ball dodging game
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kollision:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kollision:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kollision-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aaed93f9ee542e5ef0f0da51aa137632
diff --git a/metadata/md5-cache/kde-apps/kompare-15.08.3 b/metadata/md5-cache/kde-apps/kompare-15.08.3
index e4e25e51dbf3..b65eb6f8f855 100644
--- a/metadata/md5-cache/kde-apps/kompare-15.08.3
+++ b/metadata/md5-cache/kde-apps/kompare-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkomparediff2-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkomparediff2-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Kompare is a program to view the differences between files
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkomparediff2-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kompare:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkomparediff2-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kompare:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kompare-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=daa630959ddcd5e0aaa8c55bc1524e2e
diff --git a/metadata/md5-cache/kde-apps/konsole-15.08.3 b/metadata/md5-cache/kde-apps/konsole-15.08.3
index 946b10a9274f..d1b4d5211ebf 100644
--- a/metadata/md5-cache/kde-apps/konsole-15.08.3
+++ b/metadata/md5-cache/kde-apps/konsole-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 X? ( x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 X? ( x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE's terminal emulator
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
 IUSE=X test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 X? ( x11-libs/libX11 ) !kde-apps/konsole:4[handbook] !kde-apps/konsole:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 X? ( x11-libs/libX11 ) !kde-apps/konsole:4[handbook] !kde-apps/konsole:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/konsole-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3d43ede61aaecb4e87ab21871dbcadd1
diff --git a/metadata/md5-cache/kde-apps/konsole-4.14.3-r2 b/metadata/md5-cache/kde-apps/konsole-4.14.3-r2
new file mode 100644
index 000000000000..759de1ffb0e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-4.14.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DESCRIPTION=X terminal for use with KDE
+EAPI=5
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=debug test +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/konsolepart-4.14.3:4[aqua=] !kde-base/konsole: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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/4.14.3/src/konsole-4.14.3.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=13f784e89fc6e0e9c32c6ffc64aa8a36
diff --git a/metadata/md5-cache/kde-apps/konsolepart-4.14.3 b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
new file mode 100644
index 000000000000..e0357c2d4ce4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst !minimal? ( >=kde-apps/libkonq-4.14.3:4[aqua=] ) ) !aqua? ( x11-apps/bdftopcf x11-proto/kbproto x11-proto/renderproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DESCRIPTION=X terminal kpart for use by konsole and other KDE applications
+EAPI=5
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=debug minimal test aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!aqua? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/libXrender x11-libs/libXtst !minimal? ( >=kde-apps/libkonq-4.14.3:4[aqua=] ) ) !<kde-apps/konsole-4.14.3-r2 !kde-base/konsolepart: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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/4.14.3/src/konsole-4.14.3.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9b25648c6700d7b05664ce056a884550
diff --git a/metadata/md5-cache/kde-apps/kpat-15.08.3 b/metadata/md5-cache/kde-apps/kpat-15.08.3
index aa96e766476f..672c0aca8f74 100644
--- a/metadata/md5-cache/kde-apps/kpat-15.08.3
+++ b/metadata/md5-cache/kde-apps/kpat-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE patience game
 EAPI=5
 HOMEPAGE=https://games.kde.org/game.php?game=kpat
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] x11-misc/shared-mime-info >=kde-frameworks/kf-env-3 !kde-apps/kpat:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] x11-misc/shared-mime-info >=kde-frameworks/kf-env-3 !kde-apps/kpat:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kpat-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e18ed50a7af711eb4c6201aca2246177
diff --git a/metadata/md5-cache/kde-apps/kruler-15.08.3 b/metadata/md5-cache/kde-apps/kruler-15.08.3
index a3a87c085839..2d5906b8b1a8 100644
--- a/metadata/md5-cache/kde-apps/kruler-15.08.3
+++ b/metadata/md5-cache/kde-apps/kruler-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Screen ruler for Plasma
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
 IUSE=X debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-3 !kde-apps/kruler:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-3 !kde-apps/kruler:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kruler-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2969e1e5e646debd31974fb3843f0bee
diff --git a/metadata/md5-cache/kde-apps/kshisen-15.08.3 b/metadata/md5-cache/kde-apps/kshisen-15.08.3
index 4630df9a1271..046adeeff69d 100644
--- a/metadata/md5-cache/kde-apps/kshisen-15.08.3
+++ b/metadata/md5-cache/kde-apps/kshisen-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 >=kde-apps/libkmahjongg-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 >=kde-apps/libkmahjongg-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A KDE game similiar to Mahjongg
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
 IUSE=debug +handbook selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 >=kde-apps/libkmahjongg-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kshisen:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 >=kde-apps/libkmahjongg-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kshisen:4 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kshisen-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9937e9a8441c48ed624dee065b671e2b
diff --git a/metadata/md5-cache/kde-apps/ksquares-15.08.3 b/metadata/md5-cache/kde-apps/ksquares-15.08.3
index cf43dadf6214..6ef298725cfe 100644
--- a/metadata/md5-cache/kde-apps/ksquares-15.08.3
+++ b/metadata/md5-cache/kde-apps/ksquares-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE clone of the game squares
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ksquares:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ksquares:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/ksquares-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=498caba2c4fc09ee8d7923dacc22e204
diff --git a/metadata/md5-cache/kde-apps/kteatime-15.08.3-r1 b/metadata/md5-cache/kde-apps/kteatime-15.08.3-r1
index 66e55ff51edf..88027d7350eb 100644
--- a/metadata/md5-cache/kde-apps/kteatime-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kteatime-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE timer for making a fine cup of tea
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/games/kteatime
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kteatime:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kteatime:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kteatime-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3b82fc65d6c41239a54780b04a92dd94
diff --git a/metadata/md5-cache/kde-apps/ktimer-15.08.3 b/metadata/md5-cache/kde-apps/ktimer-15.08.3
index e5da35f4d5e6..ab609da93390 100644
--- a/metadata/md5-cache/kde-apps/ktimer-15.08.3
+++ b/metadata/md5-cache/kde-apps/ktimer-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Timer
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
 IUSE=doc debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ktimer:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/ktimer:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/ktimer-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5001f49cd81a51507069b5c27e59148e
diff --git a/metadata/md5-cache/kde-apps/ktp-l10n-15.08.3 b/metadata/md5-cache/kde-apps/ktp-l10n-15.08.3
index e791936a6680..e4ed4ee7f319 100644
--- a/metadata/md5-cache/kde-apps/ktp-l10n-15.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-l10n-15.08.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.14.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/ki18n-5.15.0:5 dev-qt/linguist-tools:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Telepathy internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !net-im/ktp-accounts-kcm !net-im/ktp-approver !net-im/ktp-auth-handler !net-im/ktp-common-internals !net-im/ktp-contact-list !net-im/ktp-filetransfer-handler !net-im/ktp-kded-module !net-im/ktp-send-file !net-im/ktp-text-ui >=kde-frameworks/kf-env-3 !kde-apps/ktp-l10n:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=linguas_ar? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz ) linguas_bg? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz ) linguas_bs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz ) linguas_ca? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz ) linguas_cs? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz ) linguas_da? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz ) linguas_de? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz ) linguas_el? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz ) linguas_eo? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz ) linguas_es? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz ) linguas_et? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz ) linguas_eu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz ) linguas_fa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz ) linguas_fi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz ) linguas_fr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz ) linguas_ga? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz ) linguas_gl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz ) linguas_he? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz ) linguas_hi? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz ) linguas_hr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz ) linguas_hu? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz ) linguas_ia? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz ) linguas_id? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz ) linguas_is? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz ) linguas_it? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz ) linguas_ja? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz ) linguas_kk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz ) linguas_km? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz ) linguas_ko? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz ) linguas_lt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz ) linguas_lv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz ) linguas_mr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz ) linguas_nb? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz ) linguas_nds? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz ) linguas_nl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz ) linguas_nn? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz ) linguas_pa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz ) linguas_pl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz ) linguas_pt? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz ) linguas_ro? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz ) linguas_ru? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz ) linguas_sk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz ) linguas_sl? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz ) linguas_sr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz ) linguas_sv? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz ) linguas_tr? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz ) linguas_ug? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz ) linguas_uk? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz ) linguas_wa? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz )
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c70c2aa370b2bf17470088e39c280cf8
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-15.08.3-r1 b/metadata/md5-cache/kde-apps/kwalletmanager-15.08.3-r1
index 8e29d5b2b797..7329ec30a712 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Wallet management tool
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=doc debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !kde-apps/kwalletmanager:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !kde-apps/kwalletmanager:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kwalletmanager-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=13dbd70de4fc5d7bb395c71710742c9a
diff --git a/metadata/md5-cache/kde-apps/kwrite-15.08.3 b/metadata/md5-cache/kde-apps/kwrite-15.08.3
index 6254694a284d..4dbeff101775 100644
--- a/metadata/md5-cache/kde-apps/kwrite-15.08.3
+++ b/metadata/md5-cache/kde-apps/kwrite-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE simple text editor
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kwrite:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kwrite:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/kate-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=512a89b721f42d56f559260a16767430
diff --git a/metadata/md5-cache/kde-apps/libkdegames-15.08.3-r1 b/metadata/md5-cache/kde-apps/libkdegames-15.08.3-r1
index a152dad9c506..03dead0a5af0 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/libkdegames-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 media-libs/libsndfile media-libs/openal >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 media-libs/libsndfile media-libs/openal >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Base library common to many KDE games
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=test doc debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdnssd-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdnssd-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/libkdegames-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=38577932f29200273cd2c4fefc677468
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-15.08.3 b/metadata/md5-cache/kde-apps/libkmahjongg-15.08.3
index 458251326213..5028e38aaed5 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-15.08.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=LibKMahjongg for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/libkmahjongg-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=13f598d75bdedb79554f28ee5bc276e7
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-15.08.3 b/metadata/md5-cache/kde-apps/libkomparediff2-15.08.3
index 0b3e72135721..3a2e07dcc340 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-15.08.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE library to compare files and strings
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/libkomparediff2:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/libkomparediff2:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/libkomparediff2-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ab139402f15b768e72283a29958cb48
diff --git a/metadata/md5-cache/kde-apps/lokalize-15.08.3 b/metadata/md5-cache/kde-apps/lokalize-15.08.3
index ede04deb42b8..09a9de30b793 100644
--- a/metadata/md5-cache/kde-apps/lokalize-15.08.3
+++ b/metadata/md5-cache/kde-apps/lokalize-15.08.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 >=app-text/hunspell-1.2.8 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 >=app-text/hunspell-1.2.8 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Applications 5 translation tool
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
 IUSE=python_targets_python2_7 debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 >=app-text/hunspell-1.2.8 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-python/translate-toolkit[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kf-env-3 !kde-apps/lokalize:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 >=app-text/hunspell-1.2.8 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-python/translate-toolkit[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] >=kde-frameworks/kf-env-3 !kde-apps/lokalize:4 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/lokalize-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f4793a6d776542b140e111a08b149a4
diff --git a/metadata/md5-cache/kde-apps/okteta-15.08.3 b/metadata/md5-cache/kde-apps/okteta-15.08.3
index c13d5f9255b2..5a7666b5329c 100644
--- a/metadata/md5-cache/kde-apps/okteta-15.08.3
+++ b/metadata/md5-cache/kde-apps/okteta-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdoctools-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtnetwork:5 dev-qt/designer:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtscript:5[scripttools] crypt? ( app-crypt/qca:2[qt5] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdoctools-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtnetwork:5 dev-qt/designer:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtscript:5[scripttools] crypt? ( app-crypt/qca:2[qt5] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE hexeditor
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
 IUSE=crypt examples debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdoctools-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtnetwork:5 dev-qt/designer:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtscript:5[scripttools] crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/okteta:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdoctools-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtnetwork:5 dev-qt/designer:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtscript:5[scripttools] crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/okteta:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/okteta-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80de75b8e17c0505834be4345d5e685e
diff --git a/metadata/md5-cache/kde-apps/picmi-15.08.3 b/metadata/md5-cache/kde-apps/picmi-15.08.3
index 99f770780ec4..cc95b018fe39 100644
--- a/metadata/md5-cache/kde-apps/picmi-15.08.3
+++ b/metadata/md5-cache/kde-apps/picmi-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Nonogram logic game for KDE
 EAPI=5
 HOMEPAGE=https://games.kde.org/game.php?game=picmi
 IUSE=test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/picmi:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-apps/libkdegames-15.08.3:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/picmi:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/picmi-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fab6c872c4fd8e25b1881ad8b1c517de
diff --git a/metadata/md5-cache/kde-apps/print-manager-15.08.3-r1 b/metadata/md5-cache/kde-apps/print-manager-15.08.3-r1
index 52a375bac973..f5df65011044 100644
--- a/metadata/md5-cache/kde-apps/print-manager-15.08.3-r1
+++ b/metadata/md5-cache/kde-apps/print-manager-15.08.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-print/cups >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-print/cups >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Manage print jobs and printers in Plasma
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+gtk debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-print/cups >=kde-plasma/kde-cli-tools-5.4.1:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-3 !kde-apps/print-manager:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-print/cups >=kde-plasma/kde-cli-tools-5.4.1:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-3 !kde-apps/print-manager:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/print-manager-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8f8c1a753d88f58d132427619c520275
diff --git a/metadata/md5-cache/kde-apps/umbrello-15.08.3 b/metadata/md5-cache/kde-apps/umbrello-15.08.3
index 6c006155d909..6a0d1deba21e 100644
--- a/metadata/md5-cache/kde-apps/umbrello-15.08.3
+++ b/metadata/md5-cache/kde-apps/umbrello-15.08.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdoctools-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-libs/libxml2 dev-libs/libxslt dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdoctools-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-libs/libxml2 dev-libs/libxslt dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE UML Modeller
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
 IUSE=debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdoctools-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-libs/libxml2 dev-libs/libxslt dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/umbrello:4 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdoctools-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-libs/libxml2 dev-libs/libxslt dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/umbrello:4 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/15.08.3/src/umbrello-15.08.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=183076fc3802c9aa81b4d070173d378c
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.15.0 b/metadata/md5-cache/kde-frameworks/attica-5.15.0
index 0d98c2bc7195..eac8e9522c8c 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/attica-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=999deca09af970ab57728f66c022183b
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.16.0 b/metadata/md5-cache/kde-frameworks/attica-5.16.0
index ab5b067651c0..2c0c267db9f4 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/attica-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8d413685c577afa4787ae4ca0772c21b
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.17.0 b/metadata/md5-cache/kde-frameworks/attica-5.17.0
index b77b603480be..66ea8584b1db 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/attica-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8d413685c577afa4787ae4ca0772c21b
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.15.0 b/metadata/md5-cache/kde-frameworks/baloo-5.15.0
index 655f3d80eca4..dfe9b6efe7cd 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kcrash-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/kfilemetadata-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kidletime-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/solid-5.15 dev-db/lmdb dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/baloo-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c82c788a92207532d14d45a982c29047
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.16.0 b/metadata/md5-cache/kde-frameworks/baloo-5.16.0
index a9e42abe4678..d3580a5fce0f 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kcrash-5.16 >=kde-frameworks/kdbusaddons-5.16 >=kde-frameworks/kfilemetadata-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kidletime-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/solid-5.16 dev-db/lmdb dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/baloo-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4a431ad5d0d3231fe3c752bfcbb3aab0
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.17.0 b/metadata/md5-cache/kde-frameworks/baloo-5.17.0
index 6f6888d66105..e8ed0f948ade 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kcrash-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kfilemetadata-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kidletime-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/solid-5.17 dev-db/lmdb dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/baloo:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/baloo-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=957ded033373179a2bd17ec2a21117f4
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.15.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.15.0
index 57145aed27ac..e6f7b1557725 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/bluez-qt-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6d55016c370c8d013a4b995635404e4e
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.16.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.16.0
index 0b44286262c2..ed8d7af3f1bb 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/bluez-qt-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=78cc73a0dd4694c87dc0f27e74d17f4d
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.17.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.17.0
index 6687f41baaa3..80e85e06c3c6 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=78cc73a0dd4694c87dc0f27e74d17f4d
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.16.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.16.0
index e2b337e07ffb..62be8fce7659 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.16.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/breeze-icons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c7d8567f11b5c8675fe1a361a2ac224a
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.17.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.17.0
index 3f0ab79d4586..0593ddb5cc6d 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4e0f9142f340f4f6134a443d84dab4b4
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.4.3 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.4.3
index 6be78cdef05f..f5bf4e908587 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.4.3
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-plasma/breeze-5.4.3:5
 SLOT=5/5.4
 SRC_URI=mirror://kde/stable/plasma/5.4.3/breeze-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8334449465b37e5571fe21e9bde894d7
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.15.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.15.0
index 3f3fbd4190f8..8b67745ea851 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.15.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/extra-cmake-modules-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0f0c7090b3825b67e3c14dd80e0f1163
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.16.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.16.0
index 2e4c6356bdac..7faeaf63ad9b 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.16.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/extra-cmake-modules-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f528e2870f07490aa78ba5110b165e13
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.17.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.17.0
index 7f93893b2b8c..fc2903cee748 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.17.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f528e2870f07490aa78ba5110b165e13
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0
index d85686f02771..90b955720cd3 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1 >=kde-frameworks/kcompletion-5.15 >=kde-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=dc0a8e11eddef9e7f65423a3d05eebd0
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0-r1 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0-r1
index 81dffbde3483..133d1f6c5d44 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0-r1
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1 >=kde-frameworks/kcompletion-5.15 >=kde-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/frameworkintegration-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa017c4866ee63e446d9d6887972c3c6
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.16.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.16.0
index 4836329cb478..dcfcd74b70ba 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1 >=kde-frameworks/kcompletion-5.16 >=kde-
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/frameworkintegration-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=014ce2f6a7530fe96c6a8d4d8e2d6da8
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.17.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.17.0
index 8e48a69b9aad..444872434d11 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-plasma/oxygen-fonts-5.4.1 >=kde-frameworks/kcompletion-5.17 >=kde-
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c9e9947eb94266876c945b6534e5789a
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.15.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.15.0
index 628c3189a90c..66b3f2f10333 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/kdeclarative-5.15 >=kde-frameworks/kglobalaccel-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwindowsystem-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !kde-base/kactivities:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kactivities-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6a4576d888df9908a540540d05589ea5
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.15.0-r1 b/metadata/md5-cache/kde-frameworks/kactivities-5.15.0-r1
index e451c857a921..de1e15ffd217 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.15.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.15.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/kdeclarative-5.15 >=kde-frameworks/kglobalaccel-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwindowsystem-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kactivities-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=752dbe304410ae754217ae0cbd951dd4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.16.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.16.0
index 8c3878a039ea..8bda1d14c4e3 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kdbusaddons-5.16 >=kde-frameworks/kdeclarative-5.16 >=kde-frameworks/kglobalaccel-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwindowsystem-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kactivities-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fe587bb3511fca69909a1da7bb9fa796
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.17.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
index 1395e0299213..d99e299c5ba4 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kactivities-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fe587bb3511fca69909a1da7bb9fa796
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.15.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.15.0
index 6addaf80110a..29b89178ded1 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kapidox-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3a4f5826f5d93367e4d14d6e5fc36589
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.16.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.16.0
index a253e1f29a21..45568e54c343 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kapidox-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a1e763cb84a723e3a8eddb9110fefb43
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.17.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.17.0
index 3475439839b1..aef46d6b7148 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kapidox-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a1e763cb84a723e3a8eddb9110fefb43
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.15.0 b/metadata/md5-cache/kde-frameworks/karchive-5.15.0
index 782902af05fb..e6724daad5b9 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/karchive-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f586e9286c1983e9d665723e1e01f263
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.16.0 b/metadata/md5-cache/kde-frameworks/karchive-5.16.0
index f6526994c30e..9bf26dd9d042 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/karchive-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b54522af9163c296dc6b8efcf1e2f4b6
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.17.0 b/metadata/md5-cache/kde-frameworks/karchive-5.17.0
index 1badba06c69f..4c28595d95da 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/karchive-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b54522af9163c296dc6b8efcf1e2f4b6
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.15.0 b/metadata/md5-cache/kde-frameworks/kauth-5.15.0
index 7cda789917bd..3d32b6672c89 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.15.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kauth-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f9df9fb581d0dee0db86c55b979b5b68
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.16.0 b/metadata/md5-cache/kde-frameworks/kauth-5.16.0
index f71eaab2ad7a..21c5554dd84f 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.16.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kauth-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1dbd08e3e5e6dbbc4e6ee6125d1374ff
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.17.0 b/metadata/md5-cache/kde-frameworks/kauth-5.17.0
index 08ef9a0b488d..c7f07b83155b 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.17.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kauth-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1dbd08e3e5e6dbbc4e6ee6125d1374ff
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.15.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.15.0
index ddb68d2f483c..085ab1fc535f 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kbookmarks-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aadfe5fd8dc4c7488812b356fa6fd685
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.16.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.16.0
index 74444c1537fc..b25dd2ebb20b 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kbookmarks-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0e9a3f8e1c1a2525e3e2680fd5ddf0c9
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.17.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.17.0
index 52d0aa767f5a..334acc44cab6 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0e9a3f8e1c1a2525e3e2680fd5ddf0c9
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.15.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.15.0
index 1a71e5dc0fda..86f82d49dd6e 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kdeclarative-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kcmutils-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f01eba9aa136d145eb566239f8120726
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.16.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.16.0
index 79ab408eef68..09af54fe890d 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kdeclarative-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kcmutils-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f785a1cf22863a117cbd0f11729177e4
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.17.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.17.0
index 1813021634c9..7235f78c7e41 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f785a1cf22863a117cbd0f11729177e4
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.15.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.15.0
index 7dbbc597618a..91557732d201 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kcodecs-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a8a40ee79b95a559a362a9fd788d2ee4
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.16.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.16.0
index 1452b5ad8696..75318dc81aa1 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kcodecs-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6e7a74fab7e77e8eebf179f13647416e
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.17.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.17.0
index a54aa03221a1..f7ff0236925f 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6e7a74fab7e77e8eebf179f13647416e
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.15.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.15.0
index c3115779ffd6..483e254bdc4f 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kwidgetsaddons-5.15 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kcompletion-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=68cf6401be81b240c88a8156cf2250b5
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.16.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.16.0
index 2b6f5d03a453..ab44b8714ae9 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kwidgetsaddons-5.16 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kcompletion-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4d7ae7c7b5fb3762a7721207b7763d3
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.17.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.17.0
index e4eb1b868723..4f5b1fe22541 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kwidgetsaddons-5.17 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4d7ae7c7b5fb3762a7721207b7763d3
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.15.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.15.0
index f4ce6605d9cd..15b23385326e 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kconfig-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cda01ea040e06f041bf763c5c4e0e7a6
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.16.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.16.0
index 8e74c1e94de2..09d69aa7c5e6 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kconfig-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=46f694643b82c0e955bee1f04dc6df79
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.17.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.17.0
index 3c9e0d46ebb1..51f89122a5ba 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kconfig-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=46f694643b82c0e955bee1f04dc6df79
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.15.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.15.0
index 57b9a457cbff..a289ca24ca6c 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.15 >=kde-frameworks/kcodecs-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kguiaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kwidgetsaddons-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kconfigwidgets-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5bd7689e08b9c9eb8aa4262e97f57c52
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.16.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.16.0
index f5a70f2a925d..806cda2e2a54 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.16 >=kde-frameworks/kcodecs-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kguiaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kwidgetsaddons-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kconfigwidgets-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0b5a67789cb6b515072565c641cf697d
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.17.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.17.0
index ddf7bf9b03ba..c70ebd230fdf 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.17 >=kde-frameworks/kcodecs-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kguiaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kwidgetsaddons-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=99f081edd0810775a9268438b7ed3c2b
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.15.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.15.0
index 821cffdf8407..d0712f7ee827 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kcoreaddons-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e346e7bd16e550399fc00714c5b9ce71
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.16.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.16.0
index 0a2ec83d24d0..9dedda80f469 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kcoreaddons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=76cf4be1de9fc78f98d2dd7aa67192a4
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.17.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.17.0
index 351a48de3753..12fc69fc1443 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=76cf4be1de9fc78f98d2dd7aa67192a4
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.15.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.15.0
index 605aaf7e2353..2ff5e9a08f1c 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 de
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kcrash-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c22b5db0c20c7b10e862414b7b160f3d
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.16.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.16.0
index d97cc4a2162b..60dbc20a1c98 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 de
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kcrash-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=db14c0bdbeb575fd5993ba534e28d6b6
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.17.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.17.0
index f3d05c3cbd11..182bef9a689d 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 de
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kcrash-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=db14c0bdbeb575fd5993ba534e28d6b6
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.15.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.15.0
index a14b56f79fca..afd957c270bf 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdbusaddons-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cee7f8bcbc8be6d7868f040b5c7d3a16
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.16.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.16.0
index b35c7c5327fa..e2014576009a 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdbusaddons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0d0e2af0579840801f623caac3bcc6f5
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.17.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.17.0
index d6a9b8e32cf3..ef5e2cfc2be0 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b4097148e4d9f1b8d0f31b3d89a57d01
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.15.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.15.0
index b19890d5c1f2..3f3e2c9f1298 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kglobalaccel-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kpackage-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdeclarative-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ec0cab7e3c05c10155370856c7230bd
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.16.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.16.0
index ed6abdc5448c..1290fa591635 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kglobalaccel-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kpackage-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdeclarative-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31c7b01b008c7005a014b6958591f0bb
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.17.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.17.0
index 5dbb7a0ac6df..850f3a62c604 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kpackage-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31c7b01b008c7005a014b6958591f0bb
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.15.0 b/metadata/md5-cache/kde-frameworks/kded-5.15.0
index 72eefc491e65..8db4644834f6 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kcrash-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/kinit-5.15 >=kde-frameworks/kservice-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kded-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=12171ed3b26d3f2352e64724d8186e8e
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.16.0 b/metadata/md5-cache/kde-frameworks/kded-5.16.0
index 25d1cff29a63..b24227875664 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kcrash-5.16 >=kde-frameworks/kdbusaddons-5.16 >=kde-frameworks/kinit-5.16 >=kde-frameworks/kservice-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kded-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=79e74f4d752c378222810abc097ce2e5
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.17.0 b/metadata/md5-cache/kde-frameworks/kded-5.17.0
index 58c288a415f8..36dfd340e450 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kcrash-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kinit-5.17 >=kde-frameworks/kservice-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kded-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=79e74f4d752c378222810abc097ce2e5
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.15.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.15.0
index bc5f23c3db88..9dafc4cc4159 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.15 >=kde-frameworks/kcodecs-5.15 >=kde-framewor
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/kdelibs4support-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2b028f64a7c7409d487d7fb9e11a7e32
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.16.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.16.0
index 2e461bd3da0f..5ad73cc7a652 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.16 >=kde-frameworks/kcodecs-5.16 >=kde-framewor
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/kdelibs4support-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=071e20d1ba1d80b7b446a59eb5be0308
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.17.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.17.0
index 8746f116bd67..526f804620e7 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.17 >=kde-frameworks/kcodecs-5.17 >=kde-framewor
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=071e20d1ba1d80b7b446a59eb5be0308
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.15.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.15.0
index a02c216c1908..4d6b1558187e 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/kplotting-5.15 >=kde-frameworks/ktextwidgets-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 >=kde-frameworks/sonnet-5.15 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.15 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdesignerplugin-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=52f2771bbfefbd0e34bfc7fefa6a83aa
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.16.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.16.0
index b47f8a915df3..a285d46396da 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/kplotting-5.16 >=kde-frameworks/ktextwidgets-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 >=kde-frameworks/sonnet-5.16 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.16 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdesignerplugin-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d9d966ae1a91d9b8bf429f90ae13d26c
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.17.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.17.0
index 39d7edafee4f..2aa99aa7b375 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/kplotting-5.17 >=kde-frameworks/ktextwidgets-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 >=kde-frameworks/sonnet-5.17 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.17 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d9d966ae1a91d9b8bf429f90ae13d26c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.15.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.15.0
index 2c59bb0b0a83..fdb9e7b28a9f 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kpty-5.15 >=kde-frameworks/kservice-5.15 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdesu-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=91eefb370d87eb92e7423b178b0b1894
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.16.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.16.0
index e3f8ff2afc20..b5cce553d58b 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kpty-5.16 >=kde-frameworks/kservice-5.16 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdesu-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e39e0f4e0ab36156445e957205ced58
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.17.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.17.0
index 8167d441e224..39599b4501f9 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kpty-5.17 >=kde-frameworks/kservice-5.17 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdesu-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5e39e0f4e0ab36156445e957205ced58
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.15.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.15.0
index 563c364fec6c..73680ec5af64 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kjobwidgets-5.15 >=kde-frameworks/kparts-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwallet-5.15 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdewebkit-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0c63ce9b8b0136d09bd229d52c397c9e
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.16.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.16.0
index 9ee9eda08cb1..409769260de8 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kjobwidgets-5.16 >=kde-frameworks/kparts-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwallet-5.16 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdewebkit-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8afe2627c23d9fac323aae75cac4be38
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.17.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.17.0
index 043ed8a42679..15dee75972e2 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kjobwidgets-5.17 >=kde-frameworks/kparts-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwallet-5.17 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8afe2627c23d9fac323aae75cac4be38
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.15.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.15.0
index 3c791ce6146f..fbcafdcf5d92 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdnssd-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5405afc85f7ed6fe6d5a6d689a5f086a
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.16.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.16.0
index 17cd78fcdaad..62a29d612df5 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdnssd-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ead38d0e40d85d417a8bf1f6a184455
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.17.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.17.0
index 3c8accb7ff18..31a825014460 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7ead38d0e40d85d417a8bf1f6a184455
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.15.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.15.0
index 679b8067b144..412d7b041913 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.15.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.15 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kdoctools-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ab5cbfc8304ddb6f720b54cbf7a9282b
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.16.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.16.0
index 843fb85e6192..9e48ce290bff 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.16.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.16 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kdoctools-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=354b7b1c510f06532640ce22d89256fe
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.17.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.17.0
index 0a105b706760..fb35df1a178a 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.17.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.17 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=354b7b1c510f06532640ce22d89256fe
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.15.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.15.0
index 2db2717dc4c9..cf199af6ea25 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frame
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kemoticons-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ef426ae0fa1136368f0ade3a3142e760
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.16.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.16.0
index 083864594650..4834a30eb391 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frame
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kemoticons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1e0d07f7c68f1829632f83ebda29f18
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.17.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.17.0
index 097cf98a350f..299459be037c 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frame
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f1e0d07f7c68f1829632f83ebda29f18
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.15.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.15.0
index 582c8ef5c42e..42792c7f5fec 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/ki18n-5.15 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kfilemetadata-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=32cc68d5af7a52db3cd3110ebc9774b5
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.16.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.16.0
index 45ff0fa8d3d8..a331d544bc15 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/ki18n-5.16 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kfilemetadata-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9c085055f0d0a1527b025fc9dfbeaf6b
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.17.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.17.0
index 70dd9e11accb..0ff8e0593157 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/ki18n-5.17 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9c085055f0d0a1527b025fc9dfbeaf6b
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.15.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.15.0
index ffca7ebd61de..7a3157a2d45b 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kcrash-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/kwindowsystem-5.15[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kglobalaccel-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4bab8874c3bb0faeb1d5ab7df810ff49
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.16.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.16.0
index 0db6a5cc59a9..3b141bb68b8a 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kcrash-5.16 >=kde-frameworks/kdbusaddons-5.16 >=kde-frameworks/kwindowsystem-5.16[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kglobalaccel-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c632bab2901d39f00c2e3bef96c5a24e
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.17.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.17.0
index 936eb52f53f0..5b1158b7be28 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kcrash-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kwindowsystem-5.17[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c632bab2901d39f00c2e3bef96c5a24e
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.15.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.15.0
index ad49884264d0..e53601102294 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kguiaddons-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6ad3250661fd3a5119f94b55454cc557
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.16.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.16.0
index c6090d0c0628..a4bb7240cea8 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kguiaddons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5c2e2939016201895b21cad79b606134
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.17.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.17.0
index ed7718f469aa..e91af93ec9e4 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5c2e2939016201895b21cad79b606134
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.15.0 b/metadata/md5-cache/kde-frameworks/khtml-5.15.0
index cfcdd394f6a4..74ca96eb3d53 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/kcodecs-5.15 >=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kglobalaccel-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kjobwidgets-5.15 >=kde-frameworks/kjs-5.15 >=kde-frameworks/knotifications-5.15 >=kde-frameworks/kparts-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/ktextwidgets-5.15 >=kde-frameworks/kwallet-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 >=kde-frameworks/kxmlgui-5.15 >=kde-frameworks/sonnet-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/khtml-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b29c4fc88561c3389ec0548601146275
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.16.0 b/metadata/md5-cache/kde-frameworks/khtml-5.16.0
index d6373d5483c9..a406aa73dcfd 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/kcodecs-5.16 >=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kglobalaccel-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kjobwidgets-5.16 >=kde-frameworks/kjs-5.16 >=kde-frameworks/knotifications-5.16 >=kde-frameworks/kparts-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/ktextwidgets-5.16 >=kde-frameworks/kwallet-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 >=kde-frameworks/kxmlgui-5.16 >=kde-frameworks/sonnet-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/khtml-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=649da2c9d4a38e9c8d4aed3ae52b9d7f
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.17.0 b/metadata/md5-cache/kde-frameworks/khtml-5.17.0
index a69e12a49971..fe4f6da7d8bc 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/kcodecs-5.17 >=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kjobwidgets-5.17 >=kde-frameworks/kjs-5.17 >=kde-frameworks/knotifications-5.17 >=kde-frameworks/kparts-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/ktextwidgets-5.17 >=kde-frameworks/kwallet-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 >=kde-frameworks/sonnet-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=649da2c9d4a38e9c8d4aed3ae52b9d7f
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.15.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.15.0
index ecd574dbbfca..df4e7de8f2a6 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtscript:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/ki18n-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cba2897401e724dd24ac33b97ad43711
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.16.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.16.0
index 144578cddd7e..95731157f7d1 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtscript:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/ki18n-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ca72138cd66918d98758ca47023ce53
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.17.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.17.0
index d0377dff85e8..5d7323ef4387 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtscript:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/ki18n-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ca72138cd66918d98758ca47023ce53
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.15.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.15.0
index 212b871193b4..f1a7b986efb8 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/kwidgetsaddons-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kiconthemes-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5183321e17f53a557f6979c747cfc426
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.16.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.16.0
index 3b6752f356eb..c4e63b249c40 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/kwidgetsaddons-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kiconthemes-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d566226d2f5317d823297e66428a84ed
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.17.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.17.0
index 47b71da06e16..43ce29ab1964 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/kwidgetsaddons-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d566226d2f5317d823297e66428a84ed
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.15.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.15.0
index 7b7da60eae3e..224245717290 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kidletime-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a224a916db9984b58d53de2c94ca849
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.16.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.16.0
index 852c9f60f67d..f8ded9a81038 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kidletime-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=341da6383f820210d7308bac1cfd0b75
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.17.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.17.0
index 005e24ec26e6..ec6c9102246f 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kidletime-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=341da6383f820210d7308bac1cfd0b75
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.15.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.15.0
index 182c94ca8502..f72f3fa3853c 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kimageformats-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c6c0b4b40bc7de7620b1a70c94f62b7b
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.16.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.16.0
index 6b085def79a6..fecd5a1c0c5c 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kimageformats-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=84dd24e868a6c6f6773a15b3fef67187
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.17.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.17.0
index ffbc9f0939ad..e67d1d9f8fc8 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=84dd24e868a6c6f6773a15b3fef67187
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.15.0 b/metadata/md5-cache/kde-frameworks/kinit-5.15.0
index fbb703c3620b..b6f29309b441 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kcrash-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwindowsystem-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kinit-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d17d359ca4aaff2058547eeca65dfa6
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.16.0-r1 b/metadata/md5-cache/kde-frameworks/kinit-5.16.0-r1
index 128d880643bd..8e555f9ca9aa 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.16.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.16.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kcrash-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwindowsystem-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kinit-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=79048a310b45eeed73d0f1d52056b18e
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.17.0 b/metadata/md5-cache/kde-frameworks/kinit-5.17.0
index 958cf3728f1a..b18ded7deee5 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kcrash-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kinit-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9b88c51eaab18391f1576b715394f1d2
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.15.0 b/metadata/md5-cache/kde-frameworks/kio-5.15.0
index 5df93a2dd5b4..8958a7f1cac3 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/kbookmarks-5.15 >=kde-fr
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kio-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0141e8004807ef1ea8bd910b0e0c411f
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.16.0 b/metadata/md5-cache/kde-frameworks/kio-5.16.0
index 41f44779d444..ed996fcd4531 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.16.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/kbookmarks-5.16 >=kde-fr
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kio-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f177d3fa107ec40e77a946816d44bcde
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.17.0 b/metadata/md5-cache/kde-frameworks/kio-5.17.0
index f0155a323f51..0200bcf2b8d4 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.17.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/kbookmarks-5.17 >=kde-fr
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kio-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f177d3fa107ec40e77a946816d44bcde
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.15.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.15.0
index ade605c86e26..db56169b27ea 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kitemmodels-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=81fdfd5d53acb926ae8e5385782b66d4
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.16.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.16.0
index b2c0f9fff2df..fef50b71e5b6 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kitemmodels-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a96bfcd502596c5f3a2956229efa36d7
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.17.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.17.0
index 3644bb2b9578..1514fd2e496e 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a96bfcd502596c5f3a2956229efa36d7
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.15.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.15.0
index 4e6c4ea95a9f..3fbb70cd09f7 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kitemviews-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=55707a19d12c466009649dd1fdbc28d1
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.16.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.16.0
index 9d419e5fdc2f..1319fc43b353 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kitemviews-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b95525605dfddb4d37cd6f4995a9198e
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.17.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.17.0
index c23b3e3649f3..a50ac8077bca 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b95525605dfddb4d37cd6f4995a9198e
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.15.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.15.0
index 61c2ecd78f06..1cabb364f181 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kwidgetsaddons-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kjobwidgets-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6a0be7dd830ffd08b35cbaeb762563e0
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.16.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.16.0
index b2bc45cbc613..cd4859bfd8a7 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kwidgetsaddons-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kjobwidgets-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a78f37f1ed5390b02336a2a684b7bf2
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.17.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.17.0
index 338c0fe8a4e6..55d1e6b72484 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kwidgetsaddons-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a78f37f1ed5390b02336a2a684b7bf2
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.15.0 b/metadata/md5-cache/kde-frameworks/kjs-5.15.0
index 180af1b28dc2..4946241999a8 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.15.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/kjs-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8420030664306e8859df2daed64aa4d1
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.16.0 b/metadata/md5-cache/kde-frameworks/kjs-5.16.0
index 86478ce942e6..2f306089af0e 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.16.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/kjs-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a08c30b560ec4a88c8a70f674f1b4ef5
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.17.0 b/metadata/md5-cache/kde-frameworks/kjs-5.17.0
index b63080a4a10e..ce12484c83d2 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.17.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a08c30b560ec4a88c8a70f674f1b4ef5
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.15.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.15.0
index eb0ab91f955d..b7ade5eb6e3d 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.15 >=kde-frameworks/kjs-5.15 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/kjsembed-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=baf2628646b641ed8b96c0aa7b8f72ff
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.16.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.16.0
index 9d0492a819d9..2d65e90fcbb6 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.16 >=kde-frameworks/kjs-5.16 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/kjsembed-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d504e24bc0dc95c4660047033e59c60
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.17.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.17.0
index 8a65ac182d3d..457a4cf3a21c 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.17 >=kde-frameworks/kjs-5.17 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5d504e24bc0dc95c4660047033e59c60
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.15.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.15.0
index d7cab4d3bb6b..9d6c11686b32 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.15.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/kmediaplayer-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=372465003370befaacdb6a05a18be99d
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.16.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.16.0
index 134bcbb00c7b..527a8a0678e9 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.16.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/kmediaplayer-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa1f60b730e465bd8ca51e8a58776d10
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.17.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.17.0
index e40398ef3a74..a86c62b6d573 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.17.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa1f60b730e465bd8ca51e8a58776d10
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.15.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.15.0
index ca777154f3b8..76e396f37d78 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.15 >=kde-frameworks/karchive-5.15 >=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/ktextwidgets-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/knewstuff-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=224dd9c635ddae1485f665e5f97df415
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.16.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.16.0
index 8e79b3a72292..512146dcc715 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.16 >=kde-frameworks/karchive-5.16 >=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/ktextwidgets-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/knewstuff-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d69aa5c18b7746c5758ad11a74e206cb
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.17.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.17.0
index 5f5b12090bfe..238f9e53624b 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.17 >=kde-frameworks/karchive-5.17 >=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/ktextwidgets-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d69aa5c18b7746c5758ad11a74e206cb
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.15.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.15.0
index 20468fcd160f..127a9e219431 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/knotifications-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=edf62db00ab01f143e2ea101567728bd
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.16.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.16.0
index 08d6f4a1500c..b03916d54fd1 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( dev-qt/qtspeech:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/knotifications-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2b490683ff15c4043edc4a1bb2d3825
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.17.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.17.0
index 4ce785d0d7ef..ba61b4ec4e8a 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) speech? ( dev-qt/qtspeech:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/knotifications-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c2b490683ff15c4043edc4a1bb2d3825
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.15.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.15.0
index 85d607bddea9..366577bd1c2f 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/knotifyconfig-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0a860cf05019bfb46cef154c426e3ef8
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.16.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.16.0
index ac1a4ce9cd59..5ddbda66b544 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kio-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/knotifyconfig-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f5ca5897a5ec3a60ef15747a71c83d3
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.17.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.17.0
index c5b7ae73e979..91fe8c38d405 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f5ca5897a5ec3a60ef15747a71c83d3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.15.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.15.0
index a1bd26e61e37..2a2361974da2 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kpackage-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=57335d426f5f1e50691ad290c6963425
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.16.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.16.0
index 1bc350a5a3a4..ba1ef42acd01 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kpackage-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=541c37b93ebaf090803148ac0e8fbf8d
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.17.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.17.0
index 773e99737429..a82211c26de0 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kpackage-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=541c37b93ebaf090803148ac0e8fbf8d
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.15.0 b/metadata/md5-cache/kde-frameworks/kparts-5.15.0
index a6c14f0daa32..1bf6a3104597 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kjobwidgets-5.15 >=kde-frameworks/knotifications-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kparts-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=49ca721aa91e53da9f36349de1cf471a
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.16.0 b/metadata/md5-cache/kde-frameworks/kparts-5.16.0
index 1e80bd60e596..dc944359c492 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kjobwidgets-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kparts-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cba7ca1d0425ac8ae769dbba809e2a57
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.17.0 b/metadata/md5-cache/kde-frameworks/kparts-5.17.0
index 1125591a3b83..42674e49709b 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kjobwidgets-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kparts-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=cba7ca1d0425ac8ae769dbba809e2a57
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.15.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.15.0
index 48ce7f3e69e3..98f7fae228d5 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kpeople-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5b00cc4497afe803420dd940d93edcd0
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.16.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.16.0
index 419086e36627..2eef0b8cf969 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kpeople-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59351cd5b20b4a10a0e6bc5858faf4de
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.17.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.17.0
index 7fa97af2538a..63e29f229d3c 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kpeople-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59351cd5b20b4a10a0e6bc5858faf4de
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.15.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.15.0
index 8ad6515f0f54..e7943862ef15 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kplotting-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0967b60f66dd8da6538bf3243d2c312a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.16.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.16.0
index 68b27df77fd2..6c41b9f46b5f 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kplotting-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=405bceb6ff3398c39eaf3e223f994be5
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.17.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.17.0
index e10d264c623a..ec0a0b0384c0 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kplotting-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=405bceb6ff3398c39eaf3e223f994be5
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.15.0 b/metadata/md5-cache/kde-frameworks/kpty-5.15.0
index 646c3e756c99..4659bb79504d 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 sys-libs/libutempter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kpty-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3e082f413782b95668a6e392d0eb204c
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.16.0 b/metadata/md5-cache/kde-frameworks/kpty-5.16.0
index ddf0bc3c1f99..27eef575446d 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 sys-libs/libutempter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kpty-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=88fe6d282295d4b09d455f587d9a56d6
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.17.0 b/metadata/md5-cache/kde-frameworks/kpty-5.17.0
index 4823ca63ee29..e247e2458987 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 sys-libs/libutempter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kpty-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=88fe6d282295d4b09d455f587d9a56d6
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.15.0 b/metadata/md5-cache/kde-frameworks/kross-5.15.0
index 4c1310f56938..2c42631a9243 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kparts-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kxmlgui-5.15 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/kross-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f575a9c9ffc731fde1e779cb92fac3e
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.16.0 b/metadata/md5-cache/kde-frameworks/kross-5.16.0
index 7de47ff56de1..5461754c42d1 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kparts-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kxmlgui-5.16 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/kross-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3a49a2b786fe2ec778790d57ae09f2d5
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.17.0 b/metadata/md5-cache/kde-frameworks/kross-5.17.0
index 34a93d02c459..2d6aa56208bb 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kparts-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3a49a2b786fe2ec778790d57ae09f2d5
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.15.0 b/metadata/md5-cache/kde-frameworks/krunner-5.15.0
index 83855a55d277..3f23c8ead013 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/plasma-5.15 >=kde-frameworks/solid-5.15 >=kde-frameworks/threadweaver-5.15 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/portingAids/krunner-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a0c61eece240d414d542e5b10cc3c6de
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.16.0 b/metadata/md5-cache/kde-frameworks/krunner-5.16.0
index d147e3ef8ac5..ce534046616f 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kio-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/plasma-5.16 >=kde-frameworks/solid-5.16 >=kde-frameworks/threadweaver-5.16 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/portingAids/krunner-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1ebf2ac936c2c533abfe1f62035148e1
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.17.0 b/metadata/md5-cache/kde-frameworks/krunner-5.17.0
index 327f568f2e85..316c3146c1bb 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/plasma-5.17 >=kde-frameworks/solid-5.17 >=kde-frameworks/threadweaver-5.17 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1ebf2ac936c2c533abfe1f62035148e1
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.15.0 b/metadata/md5-cache/kde-frameworks/kservice-5.15.0
index f7b9885700ea..a1d95355f5dc 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-fr
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kservice-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ca65aaf27c5e6633e48fa2440159e76
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.16.0 b/metadata/md5-cache/kde-frameworks/kservice-5.16.0
index c5c11f4d643a..10d4d7544623 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-fr
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kservice-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00e99ef186c7967d1f8ceb5c7487a1e8
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.17.0 b/metadata/md5-cache/kde-frameworks/kservice-5.17.0
index c4fce1c26bc0..26605a670560 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-fr
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kservice-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00e99ef186c7967d1f8ceb5c7487a1e8
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.15.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.15.0
index c5ba7dd3f712..a8d02835ebdd 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.15 >=kde-frameworks/kcodecs-5.15 >=kde-frame
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/ktexteditor-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b6bd2683fdb88487948fe1ac769051d4
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.16.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.16.0
index 54442731624b..cf3fe6117458 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.16 >=kde-frameworks/kcodecs-5.16 >=kde-frame
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/ktexteditor-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f052d433e140eb3ae29580cadf5e47f1
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.17.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.17.0
index 8346e25552db..1a987d2b4014 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.17 >=kde-frameworks/kcodecs-5.17 >=kde-frame
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f052d433e140eb3ae29580cadf5e47f1
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.15.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.15.0
index d29df6538d9f..6dd6e1d653bf 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.15 >=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 >=kde-frameworks/sonnet-5.15 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/ktextwidgets-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3879b0d9c4a6ee2c103be505c1f54ecf
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.16.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.16.0
index 2dd6012cf715..37f5dc31ab1b 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.16 >=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 >=kde-frameworks/sonnet-5.16 dev-qt/qtgui:5 dev-qt/qtwidgets:5 speech? ( dev-qt/qtspeech:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/ktextwidgets-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d48b51ec501b548c21e2e9f2643c7d1b
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.17.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.17.0
index 2f5f33e92153..4710956e882a 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/sonnet-5.17 dev-qt/qtgui:5 dev-qt/qtwidgets:5 speech? ( dev-qt/qtspeech:5 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d48b51ec501b548c21e2e9f2643c7d1b
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.15.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.15.0
index 903a1d7a8782..c2928027d39b 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.15 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kunitconversion-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f3709c3a06da2acdc1a9be23e2cf07cc
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.16.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.16.0
index f048e8cb70b4..4b5ecd9dec54 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.16 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kunitconversion-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f41385ed5d4181c1a42a141896575156
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.17.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.17.0
index 463077587274..9f94e47768a9 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.17 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f41385ed5d4181c1a42a141896575156
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.15.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.15.0
index f9c55c3b4a33..230fa157b4af 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kdbusaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/knotifications-5.15 >=kde-frameworks/kservice-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gpg? ( >=kde-apps/gpgmepp-14.12.0 app-crypt/gpgme ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kwallet-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a190ea20554bcf158017d4da0f57ddcf
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.16.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.16.0
index 3af7053c2e00..a3f9e90f3362 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kdbusaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/knotifications-5.16 >=kde-frameworks/kservice-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gpg? ( >=kde-apps/gpgmepp-14.12.0 app-crypt/gpgme ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kwallet-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bce35220814a7c7f3fb8ddca9b2247a1
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.17.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.17.0
index 7d449e100e6b..16e7427eae33 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/knotifications-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gpg? ( >=kde-apps/gpgmepp-14.12.0 app-crypt/gpgme ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kwallet-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bce35220814a7c7f3fb8ddca9b2247a1
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.15.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.15.0
index 1a5c0496feec..09c5f6c66dc5 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kwidgetsaddons-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00f0387270148c0915e06f2d5a29390a
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.16.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.16.0
index e90ecac494ff..731dcffb76a7 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kwidgetsaddons-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e0f8e85ba9af9cfd7e5f95a3bd742cc2
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.17.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.17.0
index 2c7fd4322e5c..1d2f17f86e3f 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e0f8e85ba9af9cfd7e5f95a3bd742cc2
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.15.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.15.0
index 78ea05291477..915e92c53009 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/lib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kwindowsystem-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=177d2be62045bbed6935e1cb5b4237ca
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.16.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.16.0
index 84f9c8c4e2a4..4c5e5889c994 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/lib
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kwindowsystem-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=818990fa30071d29f8b26cc00c1bbf94
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.17.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.17.0
index e49ec27df302..fbb1bc125e9a 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.17.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/lib
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=818990fa30071d29f8b26cc00c1bbf94
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.15.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.15.0
index 3ec63e87cdb5..32b187e7e0be 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.15 >=kde-frameworks/kconfigwidgets-5.15 >=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/kglobalaccel-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kiconthemes-5.15 >=kde-frameworks/kitemviews-5.15 >=kde-frameworks/ktextwidgets-5.15 >=kde-frameworks/kwidgetsaddons-5.15 >=kde-frameworks/kwindowsystem-5.15 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.15 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kxmlgui-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8dd04a9f1468fd1a618a5e73235b2e39
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.16.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.16.0
index 8eb6b30c3f64..7310390f0dfd 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.16 >=kde-frameworks/kconfigwidgets-5.16 >=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/kglobalaccel-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kiconthemes-5.16 >=kde-frameworks/kitemviews-5.16 >=kde-frameworks/ktextwidgets-5.16 >=kde-frameworks/kwidgetsaddons-5.16 >=kde-frameworks/kwindowsystem-5.16 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.16 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kxmlgui-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7649bc98e67307b612529121df4c3d22
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.17.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.17.0
index 052226b06ea9..6ee383d4211a 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kiconthemes-5.17 >=kde-frameworks/kitemviews-5.17 >=kde-frameworks/ktextwidgets-5.17 >=kde-frameworks/kwidgetsaddons-5.17 >=kde-frameworks/kwindowsystem-5.17 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.17 ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7649bc98e67307b612529121df4c3d22
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.15.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.15.0
index 56fa56c08452..e7f8767bc41d 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.15.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.15 >=kde-frameworks/ki18n-5.15 >=kde-frameworks/kio-5.15 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/kxmlrpcclient-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3df57c03245536ee8b9dfcfc31d0e211
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.16.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.16.0
index b79efd81f9e1..3a9ad1c81251 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.16.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.16 >=kde-frameworks/ki18n-5.16 >=kde-frameworks/kio-5.16 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/kxmlrpcclient-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=70e4f4b0c888d860b015ddd5df327c8d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.17.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.17.0
index bcb6c18c425f..a17d22183077 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.17.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=70e4f4b0c888d860b015ddd5df327c8d
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.15.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.15.0
index 71e7d175be68..e3e901d30064 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/modemmanager-qt-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=75554ce8fdc9b2a68bc77727ade93495
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.16.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.16.0
index 2240d698b023..c9177cb2f7d3 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/modemmanager-qt-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80c2fcfbb0eeec4e8f7aee005d9c677f
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.17.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.17.0
index 29006730a1fe..d183cfd87ca3 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=80c2fcfbb0eeec4e8f7aee005d9c677f
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.15.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.15.0
index da0f7ed9b8f1..5dc6e3fefe72 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/networkmanager-qt-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c319efb2f3eb958d76933399a72bbb78
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.16.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.16.0
index 2bc61496b05e..cf63ab071b00 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/networkmanager-qt-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7872fe732e28a404e4594a5eb15a21c3
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.17.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.17.0
index 8f061e837427..b4594f8d48ff 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7872fe732e28a404e4594a5eb15a21c3
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.16.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.16.0
index fb892b4b3962..36420f2f1a26 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.16.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/oxygen-icons !kde-frameworks/oxygen-icons:4
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/oxygen-icons5-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa1d518413fd2bd8fd9ad424349586ba
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.17.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.17.0
index 40f5bfddb2c6..56718cc8b52b 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.17.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/oxygen-icons !kde-frameworks/oxygen-icons:4
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa1d518413fd2bd8fd9ad424349586ba
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.15.0 b/metadata/md5-cache/kde-frameworks/plasma-5.15.0
index 8a23e20dcd90..cdce577f543a 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.15 >=kde-frameworks/karchive-5.15 >=kde-f
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=78d61958e5f2a645cdffbef94748ad01
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.15.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.15.0-r1
index 4cb905c69432..1d006ea0d4f8 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.15.0-r1
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.15 >=kde-frameworks/karchive-5.15 >=kde-f
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/plasma-framework-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=781d6a9b821c8c471fcf938e943f52cb
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.16.0 b/metadata/md5-cache/kde-frameworks/plasma-5.16.0
index 07f123a7c8c9..5decf0b47fd4 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.16 >=kde-frameworks/karchive-5.16 >=kde-f
 RESTRICT=test
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/plasma-framework-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d4f648ebb98efd77ec033f25b7d254a2
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.17.0-r2 b/metadata/md5-cache/kde-frameworks/plasma-5.17.0-r2
index 7de0233369ef..217836a3879b 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.17.0-r2
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.17.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.17 >=kde-frameworks/karchive-5.17 >=kde-f
 RESTRICT=test
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=60b3b05fa8e63c7e4d6cecb0463bbba5
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.15.0 b/metadata/md5-cache/kde-frameworks/solid-5.15.0
index ff101c2a4054..6f895b0594ca 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/solid-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=805df6653204bc45b7f4758a17a71720
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.16.0 b/metadata/md5-cache/kde-frameworks/solid-5.16.0
index 8205138079c9..6b974188f74f 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/solid-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa6d6fd8ca9e32b226ed9f150cc59d4a
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.17.0 b/metadata/md5-cache/kde-frameworks/solid-5.17.0
index 29a785fc5803..54bdfc916649 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/solid-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fa6d6fd8ca9e32b226ed9f150cc59d4a
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.15.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.15.0
index 0a10a6e51a59..3e1873689716 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/sonnet-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4f21f57f65b814a1b4dca1e477a2aeb0
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.16.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.16.0
index a0597d9a9bb2..b19aa24fe494 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/sonnet-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a9272ef530cb6b7ee1eb8a308935b5c8
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.17.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.17.0
index 702405ce4b55..4453909d5303 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/sonnet-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5a7b5d3a5649d4dd989496425d4f98e3
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.15.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.15.0
index d039f16d8446..86040048d0d1 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.15.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.15
 SRC_URI=mirror://kde/stable/frameworks/5.15/threadweaver-5.15.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ce3c8a5e3ee97c8c96f25ded8dc18f95
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.16.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.16.0
index 3001c166dc7a..d21249f1b2a7 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.16.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.16
 SRC_URI=mirror://kde/stable/frameworks/5.16/threadweaver-5.16.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=57333a41061cd4a22081c370d313e862
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.17.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.17.0
index d7a495beb91b..ae8052836784 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.17.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5/5.17
 SRC_URI=mirror://kde/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=57333a41061cd4a22081c370d313e862
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.0 b/metadata/md5-cache/kde-misc/kdirstat-3.0
index 4c436b9e278d..f39327b69ce5 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.0
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kdoctools-5.14.0:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kdoctools-5.15.0:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Nice KDE replacement to the du command
 EAPI=5
 HOMEPAGE=https://bitbucket.org/jeromerobert/k4dirstat/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.0.tar.bz2
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=38c9d860708ead94211d19eb297ea05d
diff --git a/metadata/md5-cache/kde-misc/krcstat-0.7.6 b/metadata/md5-cache/kde-misc/krcstat-0.7.6
deleted file mode 100644
index 40b14cdb0508..000000000000
--- a/metadata/md5-cache/kde-misc/krcstat-0.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/konsole-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A Gentoo system management tool
-EAPI=5
-HOMEPAGE=http://www.binro.org
-IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://binro.org/krcstat-0.7.6.tar.bz2
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8929f970592da423ca85c241babf42c3
diff --git a/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1 b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
new file mode 100644
index 000000000000..5d44777e1e10
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A Gentoo system management tool
+EAPI=5
+HOMEPAGE=http://www.binro.org
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://binro.org/krcstat-0.7.6.tar.bz2
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=c2d2cd5eef43d9b8a02c81ceb8d6a150
diff --git a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4 b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4
deleted file mode 100644
index a846a1319a9b..000000000000
--- a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/konsole-4.4:4[aqua=] >=kde-apps/libkonq-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Grid of Konsole terminals
-EAPI=5
-HOMEPAGE=http://kb.ccchl.de/quadkonsole4/
-IUSE=debug linguas_cs linguas_de linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin +handbook aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/konsole-4.4:4[aqua=] >=kde-apps/libkonq-4.4:4[aqua=] kde-frameworks/oxygen-icons linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://kb.ccchl.de/quadkonsole4/quadkonsole4-0.4.4.tar.bz2
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d189f4ef52010ff0248dedf04052742b
diff --git a/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1 b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1
new file mode 100644
index 000000000000..2ee359d3b908
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/quadkonsole-0.4.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) >=kde-apps/libkonq-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Grid of Konsole terminals
+EAPI=5
+HOMEPAGE=http://kb.ccchl.de/quadkonsole4/
+IUSE=debug linguas_cs linguas_de linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin +handbook aqua
+KEYWORDS=~amd64 ~x86
+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 linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) 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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://kb.ccchl.de/quadkonsole4/quadkonsole4-0.4.4.tar.bz2
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2ab4788473983fa75f30d18e6670a5a4
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12 b/metadata/md5-cache/kde-misc/rsibreak-0.12
index fbda36dc05ae..c60fcb970b1c 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Small utility which bothers you at certain intervals
 EAPI=5
 HOMEPAGE=https://userbase.kde.org/RSIBreak
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=789a7c739a2fb7ab75e0c88075f3fc2f
diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
index fad47f19b2d8..cf3ce6dbc5fe 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=dev-libs/boost-1.45 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-apps/systemd >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.0.0 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=dev-libs/boost-1.45 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-apps/systemd >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.0.0 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for systemd
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/playground/sysadmin/systemd-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=dev-libs/boost-1.45 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=dev-libs/boost-1.45 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0198be04e499d9f12b94a5122aa48651
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.9-r2 b/metadata/md5-cache/kde-misc/yakuake-2.9.9-r2
deleted file mode 100644
index e9b0ecaf6067..000000000000
--- a/metadata/md5-cache/kde-misc/yakuake-2.9.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/konsole-4.4:4[aqua=] x11-libs/libX11 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A quake-style terminal emulator based on KDE konsole technology
-EAPI=5
-HOMEPAGE=https://yakuake.kde.org/
-IUSE=debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_km linguas_ko linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-apps/konsole-4.4:4[aqua=] x11-libs/libX11 kde-frameworks/oxygen-icons linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/stable/yakuake/2.9.9/src/yakuake-2.9.9.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=46fa514d40bc2a44e9b3726273e13d26
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3 b/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3
new file mode 100644
index 000000000000..ee64b3276260
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/yakuake-2.9.9-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=|| ( >=kde-apps/konsolepart-4.4:4[aqua=] >=kde-apps/konsole-4.4:4[aqua=] ) x11-libs/libX11 sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A quake-style terminal emulator based on KDE konsole technology
+EAPI=5
+HOMEPAGE=https://yakuake.kde.org/
+IUSE=debug linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_it linguas_km linguas_ko linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
+KEYWORDS=amd64 ~arm ppc x86
+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 linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_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 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/stable/yakuake/2.9.9/src/yakuake-2.9.9.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3115ccdb20e00cb0f86c4c0f894f92d7
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.4.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.4.3
index ef88c3268727..0f26741f1f75 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.4.3
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/bluedevil-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=426ffc7011ca596efd0dc6cbf589a853
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.5.0 b/metadata/md5-cache/kde-plasma/bluedevil-5.5.0
index e392e6eff904..e8a7df60f164 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.5.0
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=426ffc7011ca596efd0dc6cbf589a853
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.5.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.5.1
index fdafba8b2edf..52332cd5d8b6 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.5.1
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/bluedevil-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=426ffc7011ca596efd0dc6cbf589a853
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.5.2 b/metadata/md5-cache/kde-plasma/bluedevil-5.5.2
index 004ec0eff3a2..bfe7801b06f4 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.5.2
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/bluedevil-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=07ce7557bc5022894597381c6cb36c83
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.4.3 b/metadata/md5-cache/kde-plasma/breeze-5.4.3
index 43f2f973f5ab..5e24663c41ad 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.4.3
+++ b/metadata/md5-cache/kde-plasma/breeze-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=qt4 debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.4.3:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.4.3:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/breeze-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7712d3320c6eb1df70f8f0f70bbe9713
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.5.0 b/metadata/md5-cache/kde-plasma/breeze-5.5.0
index af8ea9863668..5407a40cc01a 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.5.0
+++ b/metadata/md5-cache/kde-plasma/breeze-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=qt4 debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/breeze-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1d19b2c57f4bf8dae931a600e01f731
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.5.1 b/metadata/md5-cache/kde-plasma/breeze-5.5.1
index 6d6ecdcca66a..4274f681637a 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.5.1
+++ b/metadata/md5-cache/kde-plasma/breeze-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=qt4 debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/breeze-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1d19b2c57f4bf8dae931a600e01f731
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.5.2 b/metadata/md5-cache/kde-plasma/breeze-5.5.2
index 0a17a4e46cf7..fa0940ddfdc3 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.5.2
+++ b/metadata/md5-cache/kde-plasma/breeze-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=qt4 debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb qt4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-frameworks/breeze-icons-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/breeze-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f16384945529a0dd1edce63ca117d65b
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.0.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.0.1
index 78d40f3fa34a..1c76ef7e1064 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.0.1
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Official GTK+ port of KDE's Breeze widget style
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b27138420c2945bf73fac08c500d42ae
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.1
index 0ba0ca0b7862..db5504346851 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.1
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Official GTK+ port of KDE's Breeze widget style
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/breeze-gtk-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=af0b8a3a258436e605b9b2f52bc8f95c
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.2 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.2
index b50e146e47eb..4bfc47c6fac2 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.2
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Official GTK+ port of KDE's Breeze widget style
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/breeze-gtk-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=55914098b53baf47810c362670fc82b3
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.4.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.4.3
index bb882d37b609..5bdac1ade5b0 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=X test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kde-cli-tools-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1b7f49b04b35e6193a75418a263b8f53
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.0 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.0
index e553216b4533..4be4f2e8416f 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=X test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1b7f49b04b35e6193a75418a263b8f53
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.1
index 87c4c95b06b3..921c7dab93a7 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=X test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kde-cli-tools-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1b7f49b04b35e6193a75418a263b8f53
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.2-r1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.2-r1
index 5a3da82a7161..796c7e07035d 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.2-r1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.5.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 kdesu? ( >=kde-frameworks/kdesu-5.14.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.14.0:5 dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 kdesu? ( >=kde-frameworks/kdesu-5.15.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.15.0:5 dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=+kdesu X test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 kdesu? ( >=kde-frameworks/kdesu-5.14.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.14.0:5 dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 kdesu? ( >=kde-frameworks/kdesu-5.15.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.15.0:5 dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kde-cli-tools-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=aeab53649acef0b5a6e5fc38a7038521
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.4.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.4.3
index 72ca46ef659c..8fd81d3a4ca6 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE systemsettings kcm to set GTK application look&feel
 EAPI=5
 HOMEPAGE=https://projects.kde.org/kde-gtk-config
 IUSE=+gtk3 debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kde-gtk-config-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=39184456c9d1e291414e645d1f7409f7
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.0 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.0
index 4938edc0794d..5139050f7b78 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE systemsettings kcm to set GTK application look&feel
 EAPI=5
 HOMEPAGE=https://projects.kde.org/kde-gtk-config
 IUSE=+gtk3 test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5da62ea8df921cc5900bab5e1146cf9e
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.1
index 279dbf97af70..80c36451f82b 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE systemsettings kcm to set GTK application look&feel
 EAPI=5
 HOMEPAGE=https://projects.kde.org/kde-gtk-config
 IUSE=+gtk3 test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kde-gtk-config-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5da62ea8df921cc5900bab5e1146cf9e
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.2 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.2
index dfee40eb4639..2f795cb43d42 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE systemsettings kcm to set GTK application look&feel
 EAPI=5
 HOMEPAGE=https://projects.kde.org/kde-gtk-config
 IUSE=+gtk3 test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/kde-gtk-config:4 !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kde-gtk-config-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4c3e6df663b92fbbf2013ef39a4c2667
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.4.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.4.3
index 9aba874db827..ffd7032ccd0b 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kdecoration-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bd90793019c0580faed2b34d0ddc2c42
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.5.0 b/metadata/md5-cache/kde-plasma/kdecoration-5.5.0
index b883b5311884..fd6582343f58 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ceb78d46ab57926bc035d762b0abcfd5
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.5.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.5.1
index ef5d2c7faa8d..bb2771a35640 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kdecoration-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5cb551683d484b9f18ca1cb2b1349ce0
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.5.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.5.2
index 4522803e7731..e9220bf1ca17 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kdecoration-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fdad678c23a3f57f9547621cf292e691
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3
index bafa0d5b40a1..337daae11a89 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=ibus scim debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.4.3:5[systemmonitor] !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.4.3:5[systemmonitor] !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=5eab9ef3d5f6b4b2e051efd1d825b67e
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3-r1
index 79e98f525243..4522eca52797 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.17.0:5 >=kde-frameworks/kconfig-5.17.0:5 >=kde-frameworks/kconfigwidgets-5.17.0:5 >=kde-frameworks/kcmutils-5.17.0:5 >=kde-frameworks/kcompletion-5.17.0:5 >=kde-frameworks/kcoreaddons-5.17.0:5 >=kde-frameworks/kdelibs4support-5.17.0:5 >=kde-frameworks/ki18n-5.17.0:5 >=kde-frameworks/kio-5.17.0:5 >=kde-frameworks/knewstuff-5.17.0:5 >=kde-frameworks/knotifications-5.17.0:5 >=kde-frameworks/kpackage-5.17.0:5 >=kde-frameworks/kross-5.17.0:5 >=kde-frameworks/krunner-5.17.0:5 >=kde-frameworks/kservice-5.17.0:5 >=kde-frameworks/kunitconversion-5.17.0:5 >=kde-frameworks/kwidgetsaddons-5.17.0:5 >=kde-frameworks/kwindowsystem-5.17.0:5 >=kde-frameworks/kxmlgui-5.17.0:5 >=kde-frameworks/plasma-5.17.0:5 >=kde-frameworks/sonnet-5.17.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.4.3:5[systemmonitor] !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fc945e44e069bb4a9d62bd0855c6eec6
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.0 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.0
index e5a76fae8131..0f4950a68592 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=ibus scim debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.0:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.0:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=76cffe0ef8434a7f63b7b8174db4dbf1
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.1
index 957b1ee412fb..6fdbfbcd4df2 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=ibus scim debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.1:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.1:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kdeplasma-addons-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=76cffe0ef8434a7f63b7b8174db4dbf1
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.2 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.2
index 90fae28a92ad..92e7dd329faa 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=ibus scim debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kross-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kunitconversion-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.2:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kross-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kunitconversion-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=kde-plasma/plasma-workspace-5.5.2:5 !kde-base/kdeplasma-addons:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kdeplasma-addons-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1c7a3a6ed4ced2ef93a971ef2138f3e3
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.4.3 b/metadata/md5-cache/kde-plasma/kgamma-5.4.3
index f86670ac21ee..1cd0a2775af6 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Screen gamma values kcontrol module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kgamma5-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47cbcd100462d32f93a56bb187d02cba
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.5.0 b/metadata/md5-cache/kde-plasma/kgamma-5.5.0
index 545dc69230b6..2bedc0b8c20d 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Screen gamma values kcontrol module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47cbcd100462d32f93a56bb187d02cba
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.5.1 b/metadata/md5-cache/kde-plasma/kgamma-5.5.1
index 5554b3bbc959..c4a991d75548 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Screen gamma values kcontrol module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kgamma5-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=47cbcd100462d32f93a56bb187d02cba
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.5.2 b/metadata/md5-cache/kde-plasma/kgamma-5.5.2
index f04b05213e2d..fc3dad0d37be 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto !<kde-apps/kde4-l10n-15.08.0 !kde-apps/kgamma:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Screen gamma values kcontrol module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kgamma5-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=00913384c0c618af5ed2a5239d0a62e7
diff --git a/metadata/md5-cache/kde-plasma/khelpcenter-5.4.3 b/metadata/md5-cache/kde-plasma/khelpcenter-5.4.3
index 9817dd7b0096..48fffab98974 100644
--- a/metadata/md5-cache/kde-plasma/khelpcenter-5.4.3
+++ b/metadata/md5-cache/kde-plasma/khelpcenter-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/khelpcenter-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53b75c106f9caa40d959d2011ad6a213
diff --git a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.0 b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.0
index 9257963bcfa1..ba1b96818e16 100644
--- a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.0
+++ b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53b75c106f9caa40d959d2011ad6a213
diff --git a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.1 b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.1
index 72d737adfa1e..55799dc319bc 100644
--- a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.1
+++ b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/khelpcenter-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=53b75c106f9caa40d959d2011ad6a213
diff --git a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.2 b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.2
index caa73baa16c2..05132869fabb 100644
--- a/metadata/md5-cache/kde-plasma/khelpcenter-5.5.2
+++ b/metadata/md5-cache/kde-plasma/khelpcenter-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/khelpcenter:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/khelpcenter-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=56168407f753aa18eca9af7fd67945ce
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.4.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.4.3
index cfd7416bb708..57092724892a 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.4.3
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE workspace hotkey module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.14.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.15.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/khotkeys-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a431fa9404871c0d824f11f0b9c46cb3
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.5.0 b/metadata/md5-cache/kde-plasma/khotkeys-5.5.0
index 6bbc0a824478..a45f196e4b30 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.5.0
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE workspace hotkey module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a431fa9404871c0d824f11f0b9c46cb3
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.5.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.5.1
index 2d814aeef80e..d420b3d9a7ea 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.5.1
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE workspace hotkey module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/khotkeys-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a431fa9404871c0d824f11f0b9c46cb3
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.5.2 b/metadata/md5-cache/kde-plasma/khotkeys-5.5.2
index fa140dc1e2d2..e5e8d7a0122a 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.5.2
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE workspace hotkey module
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5[X] >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.14.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5[X] >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.15.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/khotkeys:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/khotkeys-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4103448f1ae18f72255dc54c2d93912a
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.4.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.4.3
index 59588087636a..a50a22c5d755 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.4.3:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.4.3:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A utility that provides information about a computer system
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=egl gles ieee1394 +opengl +pci samba nfs wayland X debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.4.3:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.4.3:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.4.3:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kinfocenter-5.4.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6176c09b3fd3219c7af427b93a430296
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.0 b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.0
index de5cd9cf99ff..77a1e9ec2d25 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.0:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.0:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A utility that provides information about a computer system
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=egl gles ieee1394 +opengl +pci samba nfs wayland X debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.0:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.0:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.0:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6176c09b3fd3219c7af427b93a430296
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.1
index c5f5d414624e..0a73b59c1679 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.1:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.1:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A utility that provides information about a computer system
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=egl gles ieee1394 +opengl +pci samba nfs wayland X debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.1:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.1:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.1:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kinfocenter-5.5.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=6176c09b3fd3219c7af427b93a430296
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.2 b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.2
index c30e577d05b4..73dfbaaa5234 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.2:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.2:5 ) X? ( x11-libs/libX11 ) >=kde-frameworks/plasma-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A utility that provides information about a computer system
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=egl gles ieee1394 +opengl +pci samba nfs wayland X debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.2:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.5.2:5 ) X? ( x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.5.2:5 !kde-base/kcontrol:4 !kde-base/kinfocenter:4 !kde-misc/about-distro >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kinfocenter-5.5.2.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8e8d0487cd1e0debe0d17b14ea51d255
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.4.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.4.3
index a193db2b0467..00d2cfa9e79c 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.4.3:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.4.3:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.4.3:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.4.3:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kmenuedit-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7f782fdabc279bd6bc6e4b01446668e3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.0 b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.0
index 712625f5d443..9ff105d33392 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.0:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.0:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7f782fdabc279bd6bc6e4b01446668e3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.1
index e928eafd62db..f085dad7bb72 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.1:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.1:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kmenuedit-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7f782fdabc279bd6bc6e4b01446668e3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.2 b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.2
index 35dedf928bed..c5b88cd1d457 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.2:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.2:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.2:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.5.2:5 ) !kde-base/kmenuedit:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kmenuedit-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=72d77b1dceabf5e563b9bf4bd6e8d694
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.4.3 b/metadata/md5-cache/kde-plasma/kscreen-5.4.3
index 43c0d0b371ca..7ceb50c890d4 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.4.3
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libkscreen-5.4.3:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libkscreen-5.4.3:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/libkscreen-5.4.3:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.4.3:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libkscreen-5.4.3:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.4.3:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kscreen-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=67593e702617aea309d2d8391b32213e
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a7f46ea4a29a6d053ea8db4b87351970
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.5.0 b/metadata/md5-cache/kde-plasma/kscreen-5.5.0
index 2adc901947fc..09384af8751f 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.5.0
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libkscreen-5.5.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libkscreen-5.5.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/libkscreen-5.5.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.0:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libkscreen-5.5.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.0:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=67593e702617aea309d2d8391b32213e
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a7f46ea4a29a6d053ea8db4b87351970
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.5.1 b/metadata/md5-cache/kde-plasma/kscreen-5.5.1
index 7030acff6b20..66c0cc08501b 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.5.1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libkscreen-5.5.1:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libkscreen-5.5.1:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/libkscreen-5.5.1:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.1:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libkscreen-5.5.1:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.1:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kscreen-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=67593e702617aea309d2d8391b32213e
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a7f46ea4a29a6d053ea8db4b87351970
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.5.2 b/metadata/md5-cache/kde-plasma/kscreen-5.5.2
index e8da0c3e43bf..bcf4c645922d 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.5.2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libkscreen-5.5.2:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libkscreen-5.5.2:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/libkscreen-5.5.2:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.2:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libkscreen-5.5.2:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.5.2:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kscreen-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=525ea21cb346fe7888a3314d4acf6543
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5eb33a03214c6b6f0d628e5f67e46a75
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.0 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.0
index 44e52a0f5974..0cb79e3092e0 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=pam test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.0:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.0:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=09b387ad84a657de33a8bbbf8419769f
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.1
index 3be28b2a22c6..9aa348452dfe 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=pam test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.1:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.1:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kscreenlocker-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=09b387ad84a657de33a8bbbf8419769f
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.2 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.2
index 707481abdea3..8cb07c7bd076 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=pam test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.2:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.2:5 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kdebase-pam:4 !<kde-plasma/plasma-workspace-5.4.50 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kscreenlocker-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=40f44da066a234746f95ffbc7129376f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.4.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.4.3
index 45bc6876e941..1fc69768f866 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.4.3
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/ksshaskpass-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=283ec3740106ca196a48212518ffa47e
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.0 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.0
index bbdda7115900..35ddece2d8cf 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.0
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=283ec3740106ca196a48212518ffa47e
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.1
index 8b431f83ebf1..8deafaa3d5ad 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/ksshaskpass-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=283ec3740106ca196a48212518ffa47e
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.2-r1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.2-r1
index dbcde35b27b0..7cf8ab246963 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.2-r1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.5.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/ksshaskpass-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=13f6df20646f0dbfb1edd6b37c69bf4d
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.4.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.4.3
index 5ed6c4a859f9..2ac33a83337e 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.4.3
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.4.3:5[processui] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.4.3:5[processui] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.4.3:5[processui] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libksysguard-5.4.3:5[processui] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/ksysguard-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=934796b8e4aeb3de99529b97bf53139a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.5.0 b/metadata/md5-cache/kde-plasma/ksysguard-5.5.0
index 0e09b62f4bcd..950424d17a4c 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.5.0
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.5.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.5.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.5.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libksysguard-5.5.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=560acac66e16c39b102bc05d8a706c11
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.5.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.5.1
index 930d7442e084..33249c78a365 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.5.1
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.5.1:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.5.1:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.5.1:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libksysguard-5.5.1:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/ksysguard-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=560acac66e16c39b102bc05d8a706c11
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.5.2 b/metadata/md5-cache/kde-plasma/ksysguard-5.5.2
index 41009311ca67..3c6bc0ec385b 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.5.2
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.5.2:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.5.2:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.5.2:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/libksysguard-5.5.2:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/ksysguard-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31ac927f588d19dc6e9ff57182d07361
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3
index 5547661a90bf..3dd7ce14e587 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3fa0afd2d93a6a43ac1895837eacb100
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3-r1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3-r1
index af6938781b75..415c080689ff 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3-r1
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4aebcb970d3bba4486673d565386b9f
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.0 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.0
index 10c802775875..49b52a2a32c4 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bf25f98eca735d43ccb612a3171f766b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.1
index 16220ea9bda4..60e98ee9a057 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kwallet-pam-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bf25f98eca735d43ccb612a3171f766b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.2 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.2
index 03219e7a64aa..1227a24156b0 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kwallet-pam-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=789e6fc16f3e4c6a5dd4e20c311b5939
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.4.3 b/metadata/md5-cache/kde-plasma/kwayland-5.4.3
index cdfb41a263f0..a38cba83e14e 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=kde-frame
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwayland-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a833e351005a10b817f1fd2067d21d3b
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.5.0 b/metadata/md5-cache/kde-plasma/kwayland-5.5.0
index 9eb95caa4275..652420c17298 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=kde-frame
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22aca200f5a3ec58aa819c233afc687c
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.5.1 b/metadata/md5-cache/kde-plasma/kwayland-5.5.1
index e11380ffe73f..7c11fd71610f 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=kde-frame
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kwayland-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22aca200f5a3ec58aa819c233afc687c
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.5.2 b/metadata/md5-cache/kde-plasma/kwayland-5.5.2
index 5db882806fdc..fbe4aecaf4dd 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.7.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=kde-frame
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kwayland-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=92b5e930f870440fe551f5144c63f491
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.4.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.4.3
index 09e807b0d33b..e79bcaec5f46 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwayland-integration-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=659e8805399934f721fa0acf7fa0b02e
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.0 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.0
index 891473e7bb4e..ad46405c670b 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=045a115a206b0a03532b9e1343919b75
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.1
index 4f303060ff01..4b12321d634c 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kwayland-integration-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=045a115a206b0a03532b9e1343919b75
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.2 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.2
index a917a9532352..97c07518406f 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kwayland-integration-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bda85212f3442e1b2a53669c155b963a
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.4.3 b/metadata/md5-cache/kde-plasma/kwin-5.4.3
index 5dbfb2955acb..8efa70b6575e 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kwin-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtwayland:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) dev-qt/designer:5 dev-qt/qtconcurrent:5 media-libs/mesa[egl,gles2?,wayland?] x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtwayland:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) dev-qt/designer:5 dev-qt/qtconcurrent:5 media-libs/mesa[egl,gles2?,wayland?] x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia wayland test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtwayland:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) >=kde-plasma/kde-cli-tools-5.4.3:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.4.3:5 dev-qt/qtwayland:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) >=kde-plasma/kde-cli-tools-5.4.3:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwin-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4900742a72c42410bcbc039837dac831
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.5.0 b/metadata/md5-cache/kde-plasma/kwin-5.5.0
index 2f7d85c16c53..43b872eb9ed4 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kwin-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.0:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.0:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kwin-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a32fe3b5438f77d1eed2361633852738
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.5.1 b/metadata/md5-cache/kde-plasma/kwin-5.5.1
index 6477073fc381..dbe4903a0b3c 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.1:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.1:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kwin-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a32fe3b5438f77d1eed2361633852738
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.5.2 b/metadata/md5-cache/kde-plasma/kwin-5.5.2
index e085c220065b..a5a541f15f62 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kwin-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms dev-qt/designer:5 dev-qt/qtconcurrent:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kinit-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5[X] >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.2:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kinit-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5[X] >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.5.2:5 multimedia? ( || ( dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtmultimedia:5[gstreamer010,qml] ) ) !kde-base/kwin:4 !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kwin-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4001c3b0be1b772adcf4e2fbae91b217
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.4.3 b/metadata/md5-cache/kde-plasma/kwrited-5.4.3
index e94a927b0bf6..beebce9d39bd 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.4.3
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE daemon listening for wall and write messages
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/kwrited-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31435383db703c0e19d20592e23e16f2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.5.0 b/metadata/md5-cache/kde-plasma/kwrited-5.5.0
index 720a884c037d..be40260ffbc6 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.5.0
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE daemon listening for wall and write messages
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31435383db703c0e19d20592e23e16f2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.5.1 b/metadata/md5-cache/kde-plasma/kwrited-5.5.1
index d3e487eafa52..f30d9620bbbe 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.5.1
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE daemon listening for wall and write messages
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/kwrited-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31435383db703c0e19d20592e23e16f2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.5.2 b/metadata/md5-cache/kde-plasma/kwrited-5.5.2
index fa40def0e8ba..2bc63a7f4dae 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.5.2
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE daemon listening for wall and write messages
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kpty-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kpty-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/kwrited-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=237f2d7e96e7d44fc5cb01d18594f893
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.4.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.4.3
index 9ff1de055fab..c510a4665025 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.4.3
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/libkscreen-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=75fa1fc4066ffe2035cbb5959a9560ae
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.5.0 b/metadata/md5-cache/kde-plasma/libkscreen-5.5.0
index 1bf4a8d80bfb..185c883584b6 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.5.0
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7bb76e273dfacc91bc4f4f679e2d75a1
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.5.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.5.1
index 154c55509b65..d64b29a253de 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.5.1
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/libkscreen-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7bb76e273dfacc91bc4f4f679e2d75a1
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.5.2 b/metadata/md5-cache/kde-plasma/libkscreen-5.5.2
index d687a668e785..486c95fa2a68 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.5.2
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/libkscreen-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3fecf5ee4586784e1df910eed7897eb0
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.4.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.4.3
index 96f7cbbe7177..96d65caa74ee 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.4.3
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Task management and system monitoring library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+processui X test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/libksysguard-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d0d17ca807218c30c594ddbd16e790f6
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.5.0 b/metadata/md5-cache/kde-plasma/libksysguard-5.5.0
index 1d9c93289900..64c6fa163230 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.5.0
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Task management and system monitoring library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+detailedmemory X test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=74c5a8d7b58fb686635897878316cd8a
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.5.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.5.1
index b455ed30571c..2f3608b2f54e 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.5.1
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Task management and system monitoring library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+detailedmemory X test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/libksysguard-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=74c5a8d7b58fb686635897878316cd8a
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.5.2 b/metadata/md5-cache/kde-plasma/libksysguard-5.5.2
index 88f2fd5c298b..e1df3feb2a7d 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.5.2
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Task management and system monitoring library
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+detailedmemory X test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib detailedmemory? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/libksysguard-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1ca737555042d4a456e38c996dd2dad8
diff --git a/metadata/md5-cache/kde-plasma/milou-5.4.3 b/metadata/md5-cache/kde-plasma/milou-5.4.3
index 3e4701906e26..b0577ed15bea 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.4.3
+++ b/metadata/md5-cache/kde-plasma/milou-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/milou-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a8d446ab9cbbedb3289a0937e4c999e2
diff --git a/metadata/md5-cache/kde-plasma/milou-5.5.0 b/metadata/md5-cache/kde-plasma/milou-5.5.0
index 37f081dc8bae..b7a39db1bb57 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.5.0
+++ b/metadata/md5-cache/kde-plasma/milou-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/milou-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a8d446ab9cbbedb3289a0937e4c999e2
diff --git a/metadata/md5-cache/kde-plasma/milou-5.5.1 b/metadata/md5-cache/kde-plasma/milou-5.5.1
index 291043ca58d5..f7033f891b4e 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.5.1
+++ b/metadata/md5-cache/kde-plasma/milou-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/milou-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a8d446ab9cbbedb3289a0937e4c999e2
diff --git a/metadata/md5-cache/kde-plasma/milou-5.5.2 b/metadata/md5-cache/kde-plasma/milou-5.5.2
index fb59dcb37433..6f641e868dd1 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.5.2
+++ b/metadata/md5-cache/kde-plasma/milou-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/milou:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/milou-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=033ed73e1cd70e1f2f660bd74ebc3046
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.4.3 b/metadata/md5-cache/kde-plasma/oxygen-5.4.3
index 449f82ef435d..273da4697298 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.4.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager theme
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/oxygen-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b328fc6b51bf2c4adbbc585dfc080fac
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.5.0 b/metadata/md5-cache/kde-plasma/oxygen-5.5.0
index 70ec6c44b176..460ffbadd06f 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.5.0
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager theme
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b328fc6b51bf2c4adbbc585dfc080fac
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.5.1 b/metadata/md5-cache/kde-plasma/oxygen-5.5.1
index d1f78e7fed25..1336af18c7f1 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.5.1
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager theme
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/oxygen-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b328fc6b51bf2c4adbbc585dfc080fac
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.5.2 b/metadata/md5-cache/kde-plasma/oxygen-5.5.2
index 89020c49ca3b..d111c460802b 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.5.2
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kservice-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager theme
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-plasma/kdecoration-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors:4 !kde-base/oxygen:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/oxygen-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e1c50ef763d67b802dfd92e149056775
diff --git a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3 b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
index 56a0daf4fb04..ecdc19b4c198 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 media-gfx/fontforge >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 media-gfx/fontforge >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Desktop/GUI font family for integrated use with the KDE desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen-fonts
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RDEPEND=!media-fonts/oxygen-fonts
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	font	cd7790315ca5b8c505e1e0513df6acce	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=22cfaf4671fbf56e8e62ce9e6c6222a1
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.4.3
index 0c5e096b5bf7..814eaa7d2848 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/kwin-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/kwin-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma desktop
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/kwin-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.4.3:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/oxygen-5.4.3:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.4.3:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/kwin-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.4.3:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/oxygen-5.4.3:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.4.3:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-desktop-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=423cceeb4fa7ef88fde54c417a87d1be
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1
index 77677b4d95a7..7f6305f401e8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/kwin-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/kwin-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma desktop
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/kwin-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-plasma/oxygen-5.5.0:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.0:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/kwin-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-plasma/oxygen-5.5.0:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.0:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8a597c7c38dcd2a9725d0eecac4a15e7
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.1
index dd2ce5fb1245..a7fa3dfd94ff 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/kwin-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/kwin-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma desktop
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/kwin-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.1:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/oxygen-5.5.1:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.1:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/kwin-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.1:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/oxygen-5.5.1:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.1:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-desktop-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=31a787766cea8c6036d535df87a36d25
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.2
index 0894476e591d..5bda18d78607 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/kwin-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/kwin-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto evdev? ( x11-drivers/xf86-input-evdev ) fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma desktop
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/kwin-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 >=kde-frameworks/attica-5.14.0:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kded-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemmodels-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kpeople-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.2:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-plasma/oxygen-5.5.2:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.2:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/kwin-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 >=kde-frameworks/attica-5.15.0:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kded-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemmodels-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kpeople-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-plasma/breeze-5.5.2:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-plasma/oxygen-5.5.2:5 sys-apps/accountsservice x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.2:5 ) qt4? ( kde-base/qguiplatformplugin_kde ) !kde-apps/kcontrol !kde-apps/kdepasswd !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-base/plasma-workspace:4 !kde-base/solid-actions-kcm:4 !kde-base/systemsettings:4 !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-desktop-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=7d31a96997fe529dce45501feb290719
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.4.3
index 0d5c0dfa23b8..5887b9e57ad2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Unified media experience for any device capable of running KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=semantic-desktop debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-mediacenter-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=415e29bf574456bbc6ce52c535545ca9
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.0
index 785dd8159ee4..d5f2c193a2f8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Unified media experience for any device capable of running KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=semantic-desktop debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=415e29bf574456bbc6ce52c535545ca9
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.1
index 9c4c9a368469..778d87253b46 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Unified media experience for any device capable of running KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=semantic-desktop debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-mediacenter-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=415e29bf574456bbc6ce52c535545ca9
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.2
index 5bcb55abdc4e..3568791c161e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Unified media experience for any device capable of running KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=semantic-desktop debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kfilemetadata-5.14.0:5 ) >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kfilemetadata-5.15.0:5 ) >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-mediacenter-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=9f4bb42726bef330fdbf44a0f743f5fb
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.4.3
index 0b8cc87a9900..03c61b2dcdae 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.4.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.4.3:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/kdecoration-5.4.3:5 >=kde-plasma/kdeplasma-addons-5.4.3:5 >=kde-plasma/kgamma-5.4.3:5 >=kde-plasma/khelpcenter-5.4.3:5 >=kde-plasma/khotkeys-5.4.3:5 >=kde-plasma/kinfocenter-5.4.3:5 >=kde-plasma/kmenuedit-5.4.3:5 >=kde-plasma/kscreen-5.4.3:5 >=kde-plasma/ksshaskpass-5.4.3:5 >=kde-plasma/ksysguard-5.4.3:5 >=kde-plasma/kwallet-pam-5.4.3:5 >=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwayland-integration-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/kwrited-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 >=kde-plasma/milou-5.4.3:5 >=kde-plasma/oxygen-5.4.3:5 >=kde-plasma/oxygen-fonts-5.4.3:5 >=kde-plasma/plasma-desktop-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 >=kde-plasma/polkit-kde-agent-5.4.3:5 >=kde-plasma/powerdevil-5.4.3:5 >=kde-plasma/systemsettings-5.4.3:5 >=kde-plasma/user-manager-5.4.3:5 bluetooth? ( >=kde-plasma/bluedevil-5.4.3:5 ) display-manager? ( sddm? ( x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) gtk? ( >=kde-plasma/kde-gtk-config-5.4.3:5 ) mediacenter? ( >=kde-plasma/plasma-mediacenter-5.4.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.4.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.4.3:5 ) sddm? ( >=kde-plasma/sddm-kcm-5.4.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.4.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.4.3:5 )
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c6c264837e666dd5ff8831eddd3fe0fd
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.0
index 6ccdab872b8d..27a3e3512327 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.5.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-plasma/kdecoration-5.5.0:5 >=kde-plasma/kdeplasma-addons-5.5.0:5 >=kde-plasma/kgamma-5.5.0:5 >=kde-plasma/khelpcenter-5.5.0:5 >=kde-plasma/khotkeys-5.5.0:5 >=kde-plasma/kinfocenter-5.5.0:5 >=kde-plasma/kmenuedit-5.5.0:5 >=kde-plasma/kscreen-5.5.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/ksshaskpass-5.5.0:5 >=kde-plasma/ksysguard-5.5.0:5 >=kde-plasma/kwallet-pam-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/kwayland-integration-5.5.0:5 >=kde-plasma/kwin-5.5.0:5 >=kde-plasma/kwrited-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/libksysguard-5.5.0:5 >=kde-plasma/milou-5.5.0:5 >=kde-plasma/oxygen-5.5.0:5 >=kde-plasma/plasma-desktop-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 >=kde-plasma/polkit-kde-agent-5.5.0:5 >=kde-plasma/powerdevil-5.5.0:5 >=kde-plasma/systemsettings-5.5.0:5 >=kde-plasma/user-manager-5.5.0:5 bluetooth? ( >=kde-plasma/bluedevil-5.5.0:5 ) display-manager? ( sddm? ( x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) gtk? ( >=kde-plasma/breeze-gtk-5.5.0:5 >=kde-plasma/kde-gtk-config-5.5.0:5 ) mediacenter? ( >=kde-plasma/plasma-mediacenter-5.5.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.5.0:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.0:5 ) sddm? ( >=kde-plasma/sddm-kcm-5.5.0:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.5.0:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.5.0:5 )
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ddb66683f645ffa128f21522dd81478
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.1
index f463ba94a4fd..ede1cb38c083 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.5.1:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/kdecoration-5.5.1:5 >=kde-plasma/kdeplasma-addons-5.5.1:5 >=kde-plasma/kgamma-5.5.1:5 >=kde-plasma/khelpcenter-5.5.1:5 >=kde-plasma/khotkeys-5.5.1:5 >=kde-plasma/kinfocenter-5.5.1:5 >=kde-plasma/kmenuedit-5.5.1:5 >=kde-plasma/kscreen-5.5.1:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/ksshaskpass-5.5.1:5 >=kde-plasma/ksysguard-5.5.1:5 >=kde-plasma/kwallet-pam-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwayland-integration-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/kwrited-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 >=kde-plasma/milou-5.5.1:5 >=kde-plasma/oxygen-5.5.1:5 >=kde-plasma/plasma-desktop-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 >=kde-plasma/polkit-kde-agent-5.5.1:5 >=kde-plasma/powerdevil-5.5.1:5 >=kde-plasma/systemsettings-5.5.1:5 >=kde-plasma/user-manager-5.5.1:5 bluetooth? ( >=kde-plasma/bluedevil-5.5.1:5 ) display-manager? ( sddm? ( x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) gtk? ( >=kde-plasma/breeze-gtk-5.5.1:5 >=kde-plasma/kde-gtk-config-5.5.1:5 ) mediacenter? ( >=kde-plasma/plasma-mediacenter-5.5.1:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.5.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.1:5 ) sddm? ( >=kde-plasma/sddm-kcm-5.5.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.5.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.5.1:5 )
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ddb66683f645ffa128f21522dd81478
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.2
index 848735c25644..ab576b3c5597 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.5.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.5.2:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-plasma/kdecoration-5.5.2:5 >=kde-plasma/kdeplasma-addons-5.5.2:5 >=kde-plasma/kgamma-5.5.2:5 >=kde-plasma/khelpcenter-5.5.2:5 >=kde-plasma/khotkeys-5.5.2:5 >=kde-plasma/kinfocenter-5.5.2:5 >=kde-plasma/kmenuedit-5.5.2:5 >=kde-plasma/kscreen-5.5.2:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/ksshaskpass-5.5.2:5 >=kde-plasma/ksysguard-5.5.2:5 >=kde-plasma/kwallet-pam-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/kwayland-integration-5.5.2:5 >=kde-plasma/kwin-5.5.2:5 >=kde-plasma/kwrited-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/libksysguard-5.5.2:5 >=kde-plasma/milou-5.5.2:5 >=kde-plasma/oxygen-5.5.2:5 >=kde-plasma/plasma-desktop-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 >=kde-plasma/polkit-kde-agent-5.5.2:5 >=kde-plasma/powerdevil-5.5.2:5 >=kde-plasma/systemsettings-5.5.2:5 >=kde-plasma/user-manager-5.5.2:5 bluetooth? ( >=kde-plasma/bluedevil-5.5.2:5 ) display-manager? ( sddm? ( x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) gtk? ( >=kde-plasma/breeze-gtk-5.5.2:5 >=kde-plasma/kde-gtk-config-5.5.2:5 ) mediacenter? ( >=kde-plasma/plasma-mediacenter-5.5.2:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.5.2:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.5.2:5 ) sddm? ( >=kde-plasma/sddm-kcm-5.5.2:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.5.2:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.5.2:5 )
 SLOT=5
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51df2d04d711a87407425ea9ecd90cf1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.4.3
index 9c4ebc121de3..24e669ead228 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.4.3:5[systemmonitor] !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.4.3:5[systemmonitor] !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-nm-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=fced64e57b65d9fd549565fc0cf646bd
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.0
index 0bf87017e713..81726cd412af 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.0:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.0:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b40603e9e131d24d3f195098db5bdcd
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.1
index 8ff1e9b35d20..c2795add4890 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.1:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.1:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-nm-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b40603e9e131d24d3f195098db5bdcd
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.2
index 0d83d54dfbe9..5006d6f744d4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/networkmanager-qt-5.14.0:5[teamd=] >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.14.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.2:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/networkmanager-qt-5.15.0:5[teamd=] >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=app-crypt/qca-2.1.0.3-r1:2[qt5] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.15.0:5 dev-qt/qtxml:5 net-misc/mobile-broadband-provider-info ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.5.2:5 !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-nm-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3a36450cd9398e44a233c9d9fba24e1f
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.4.3
index 9ee7c8c7e100..751c46031e2c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-pa-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a17a8491e2e32c0cfeb0da3d37058dae
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.0
index b5dbcc3ca50e..86722e193605 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a17a8491e2e32c0cfeb0da3d37058dae
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.1
index 75daf1c23120..214a0fd36011 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-pa-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a17a8491e2e32c0cfeb0da3d37058dae
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.2
index b69fb85dfefe..43cc5e56701b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-sound/pulseaudio >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-pa-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b3c5808f2dc2a09adb030b28d5503834
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.4.3
index ea8c91632475..0add5ea34c74 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Useful applications for Plasma development
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-sdk-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4b1df48752bf769e3e08a9cff79b5857
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.0
index 2e9462590db7..bd0b0e073ee6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Useful applications for Plasma development
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4b1df48752bf769e3e08a9cff79b5857
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.1
index 6cf6fad53757..7fdd4253c757 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Useful applications for Plasma development
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-sdk-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4b1df48752bf769e3e08a9cff79b5857
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.2
index 1bf218448346..dc664b83a6ea 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Useful applications for Plasma development
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-sdk-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=89256d1b50fe5b5da3ffcfdfd1828094
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3
index f44d42aebfda..dfbb9add14ed 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.14.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.15.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +drkonqi +geolocation gps prison qalculate +systemmonitor test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 >=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.14.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/milou-5.4.3:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemmonitor? ( >=kde-plasma/ksysguard-5.4.3:5 ) !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 >=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.15.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/milou-5.4.3:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemmonitor? ( >=kde-plasma/ksysguard-5.4.3:5 ) !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ce6441e3e1b5d3a4d3be58f9d3fdbd1
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3-r1
index 16bee1dbb621..b1687f5a9c86 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.4.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.14.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) pam? ( virtual/pam ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.15.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) pam? ( virtual/pam ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.14.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) pam? ( virtual/pam ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/milou-5.4.3:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemmonitor? ( >=kde-plasma/ksysguard-5.4.3:5 ) !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kcminit:4 !kde-base/kdebase-pam:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.4.3:5 >=kde-plasma/kwin-5.4.3:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/libksysguard-5.4.3:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.15.0:5 dev-qt/qtwebkit:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) pam? ( virtual/pam ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.4.3:5[processui] ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.4.3:5 >=kde-plasma/milou-5.4.3:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemmonitor? ( >=kde-plasma/ksysguard-5.4.3:5 ) !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !<kde-base/kcheckpass-4.11.22-r1:4 !kde-base/kcminit:4 !kde-base/kdebase-pam:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d9e042d8d20ff356ba4e2b379ad06679
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.0
index 7b9cf8f196b1..3c57af9cabe5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/kwin-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/libksysguard-5.5.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/kwin-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/libksysguard-5.5.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +geolocation gps prison qalculate test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/kwin-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/libksysguard-5.5.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-plasma/ksysguard-5.5.0:5 >=kde-plasma/milou-5.5.0:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/kwin-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/libksysguard-5.5.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.0:5 >=kde-plasma/ksysguard-5.5.0:5 >=kde-plasma/milou-5.5.0:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2900d32d7a8e4fcf1ce38a793271c3e4
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1
index 5131fd8da1c6..b7671ef14a02 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +geolocation gps prison qalculate test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/ksysguard-5.5.1:5 >=kde-plasma/milou-5.5.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/ksysguard-5.5.1:5 >=kde-plasma/milou-5.5.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-workspace-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2900d32d7a8e4fcf1ce38a793271c3e4
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1.1
index 5397b4f3516f..30b2fd75f386 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +geolocation gps prison qalculate test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/ksysguard-5.5.1:5 >=kde-plasma/milou-5.5.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.1:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/kwin-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/libksysguard-5.5.1:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.1:5 >=kde-plasma/ksysguard-5.5.1:5 >=kde-plasma/milou-5.5.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-workspace-5.5.1.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a273d55a469d4c8b4e61cb6cfe90ed76
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.2-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.2-r1
index 45ed28c14152..7f5d7dbe57ee 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.2-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.5.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/kwin-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/libksysguard-5.5.2:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/kwin-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/libksysguard-5.5.2:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.5.0:5 ) >=dev-qt/qtcore-5.5.0:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=dbus +geolocation gps prison qalculate test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/baloo-5.14.0:5 >=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kdesu-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/kguiaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kjs-5.14.0:5 >=kde-frameworks/kjsembed-5.14.0:5 >=kde-frameworks/knewstuff-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kpackage-5.14.0:5 >=kde-frameworks/krunner-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktexteditor-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/kxmlrpcclient-5.14.0:5 >=kde-frameworks/plasma-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/kwin-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/libksysguard-5.5.2:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.14.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.14.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-plasma/ksysguard-5.5.2:5 >=kde-plasma/milou-5.5.2:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
+RDEPEND=>=kde-frameworks/baloo-5.15.0:5 >=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kdesu-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/kguiaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kjs-5.15.0:5 >=kde-frameworks/kjsembed-5.15.0:5 >=kde-frameworks/knewstuff-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kpackage-5.15.0:5 >=kde-frameworks/krunner-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktexteditor-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/kxmlrpcclient-5.15.0:5 >=kde-frameworks/plasma-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kscreenlocker-5.5.2:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/kwin-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/libksysguard-5.5.2:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/xcb-util x11-libs/xcb-util-image dbus? ( dev-libs/libdbusmenu-qt[qt5] ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.15.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) >=kde-frameworks/kded-5.15.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.5.2:5 >=kde-plasma/ksysguard-5.5.2:5 >=kde-plasma/milou-5.5.2:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-base/freespacenotifier:4 !kde-base/libtaskmanager:4 !kde-base/kcminit:4 !kde-base/kdebase-startkde:4 !kde-base/klipper:4 !kde-base/krunner:4 !kde-base/ksmserver:4 !kde-base/ksplash:4 !kde-base/plasma-workspace:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.5.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-workspace-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ec0be9a5984e164834832c411233d4ad
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.4.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.4.3
index 4f5976859cb8..8962049168f3 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.4.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/plasma-workspace-wallpapers-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=63e9ff478b2079f96266f2bf3eca59fb
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0-r1
similarity index 74%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0-r1
index 74a298dba396..f3c384664057 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]
+RDEPEND=!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a267c91bf0b45310752ea94aabee5929
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7f63c893ebd236bf0144f55ee81d13fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1-r1
similarity index 74%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1-r1
index 54b9f2ba6f78..cdf1424c44be 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]
+RDEPEND=!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/plasma-workspace-wallpapers-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a267c91bf0b45310752ea94aabee5929
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7f63c893ebd236bf0144f55ee81d13fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2-r1
similarity index 74%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2-r1
index e0fe4a7c84c8..435a4420c50b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.5.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.14.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.15.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]
+RDEPEND=!<kde-apps/kde-wallpapers-15.08.3[-minimal(-)]
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/plasma-workspace-wallpapers-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a83c1faa0f2ae284ac907e9284bf678e
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a9ecdfdfc8c5293e698fddb6c83145f3
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.4.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.4.3
index 1181eaa84fb5..132e7bf10350 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.4.3
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PolKit agent module for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/polkit-kde-agent-1-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f668a1ca2a245a34198e093627e2312
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.0 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.0
index bf715e68ba79..80e56e6f5e59 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.0
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PolKit agent module for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f668a1ca2a245a34198e093627e2312
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.1
index 31acca22abb1..0daaa29685cf 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.1
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PolKit agent module for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/polkit-kde-agent-1-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2f668a1ca2a245a34198e093627e2312
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.2 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.2
index 81306d513405..ea26636ff33a 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.2
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PolKit agent module for KDE
 EAPI=5
 HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/polkit-kde-agent-1-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=010b034419e92732497ca083c6407eb4
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.4.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.4.3
index 0d00161fe8de..998debdd9b3c 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.4.3
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=systemd debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.4.3:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/libkscreen-5.4.3:5 >=kde-plasma/plasma-workspace-5.4.3:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.4.3:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/powerdevil-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e261a213c81f413839fa8c5c0053303f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.5.0 b/metadata/md5-cache/kde-plasma/powerdevil-5.5.0
index 13bb130e75c0..aefef6dabcd1 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.5.0
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=systemd debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.0:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.0:5 >=kde-plasma/libkscreen-5.5.0:5 >=kde-plasma/plasma-workspace-5.5.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.0:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac0297125835627c8754d4f817d53bfb
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.5.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.5.1
index 8a6f538cf6a9..5d01700670da 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.5.1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=systemd debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.1:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.1:5 >=kde-plasma/libkscreen-5.5.1:5 >=kde-plasma/plasma-workspace-5.5.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.1:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/powerdevil-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ac0297125835627c8754d4f817d53bfb
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.5.2-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.5.2-r1
index fcf50c4b9d86..25a4b89c98d5 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.5.2-r1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.5.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=systemd debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.14.0:5 >=kde-frameworks/kauth-5.14.0:5[policykit] >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.2:5 systemd? ( >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat || ( ( >=sys-auth/consolekit-1.0.0 >=sys-power/upower-0.9.23 ) sys-power/upower-pm-utils ) ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kactivities-5.15.0:5 >=kde-frameworks/kauth-5.15.0:5[policykit] >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-plasma/kwayland-5.5.2:5 >=kde-plasma/libkscreen-5.5.2:5 >=kde-plasma/plasma-workspace-5.5.2:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.5.2:5 systemd? ( >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat || ( ( >=sys-auth/consolekit-1.0.0 >=sys-power/upower-0.9.23 ) sys-power/upower-pm-utils ) ) !kde-base/powerdevil:4 !kde-base/systemsettings:4[handbook] >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/powerdevil-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=bf65a8594c9ffdbf7cb5f4d29f746d0d
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.4.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.4.3
index 08f882077307..4d4e18dfd3bc 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.4.3
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for SDDM
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.4.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.4.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/sddm-kcm-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26ab5ccb5ddecbd4d7121b95b1c4ebb5
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.0 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.0
index a01aa83f1e1f..f79eb3053549 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.0
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for SDDM
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.0:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.0:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26ab5ccb5ddecbd4d7121b95b1c4ebb5
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.1
index 45e6ce0ecb88..50bc5ffac530 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.1
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for SDDM
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/sddm-kcm-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26ab5ccb5ddecbd4d7121b95b1c4ebb5
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.2 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.2
index a234f929efdf..544cae6fabe3 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.2
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for SDDM
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.2:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.5.2:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/sddm-kcm-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=08cdefb07f3cdff4d3ae12c43f3b7448
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.4.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.4.3
index e749fd2cd62c..dedc6eef8875 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.4.3
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gtk debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.4.3:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.4.3:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/systemsettings-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b480215a578d4288ae8aa90c2e45338
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.5.0 b/metadata/md5-cache/kde-plasma/systemsettings-5.5.0
index 2b1c4f1feaf0..0052f1090ae3 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.5.0
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gtk debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.5.0:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.5.0:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b480215a578d4288ae8aa90c2e45338
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.5.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.5.1
index ab979c961d12..41f29ddefaa0 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.5.1
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=gtk debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/khtml-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.5.1:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/khtml-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.5.1:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/systemsettings-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8b480215a578d4288ae8aa90c2e45338
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.5.2 b/metadata/md5-cache/kde-plasma/systemsettings-5.5.2
index 220a8171bb6a..7fee72a6ab28 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.5.2
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 classic? ( >=kde-frameworks/khtml-5.14.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 classic? ( >=kde-frameworks/khtml-5.15.0:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=classic gtk debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.14.0:5 >=kde-frameworks/kcmutils-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 classic? ( >=kde-frameworks/khtml-5.14.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.5.2:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kauth-5.15.0:5 >=kde-frameworks/kcmutils-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 classic? ( >=kde-frameworks/khtml-5.15.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.5.2:5 ) !kde-base/systemsettings:4 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/systemsettings-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b19180a1f7bb2786fb8925d80b6c239b
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.4.3 b/metadata/md5-cache/kde-plasma/user-manager-5.4.3
index ee9a30a18a16..05969148c6d4 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.4.3
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/user-manager-5.4.3.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2cb4e54eb732e17aaa3cf52e57c7ce2d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.5.0 b/metadata/md5-cache/kde-plasma/user-manager-5.5.0
index eb2e5327d7e7..5aada647b10f 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.5.0
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2cb4e54eb732e17aaa3cf52e57c7ce2d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.5.1 b/metadata/md5-cache/kde-plasma/user-manager-5.5.1
index 29d27de2c32b..9ee95714314f 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.5.1
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.1/user-manager-5.5.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2cb4e54eb732e17aaa3cf52e57c7ce2d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.5.2 b/metadata/md5-cache/kde-plasma/user-manager-5.5.2
index 7313109a6dbb..c755472afab9 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.5.2
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=5
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdelibs4support-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdelibs4support-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 dev-libs/libpwquality dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !<kde-apps/kde4-l10n-15.08.0-r1 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.5.2/user-manager-5.5.2.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c4324793f2edc3f46190679f7ef00492
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.10.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.10.0-r1
new file mode 100644
index 000000000000..cadae3ea329d
--- /dev/null
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.10.0 ~lxqt-base/lxqt-globalkeys-0.10.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=LXQt desktop panel and plugins
+EAPI=5
+HOMEPAGE=http://lxqt.org/
+IUSE=+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop statusnotifier sysstat +taskbar +tray +volume worldclock
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1+
+RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.10.0 ~lxqt-base/lxqt-globalkeys-0.10.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) dev-qt/qtsvg:5 >=lxde-base/lxmenu-data-0.1.2
+REQUIRED_USE=volume? ( || ( alsa pulseaudio ) )
+SLOT=0
+SRC_URI=https://downloads.lxqt.org/lxqt/0.10.0/lxqt-panel-0.10.0.tar.xz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3e04919a61eb6f6c04ab340b3ad22da8
diff --git a/metadata/md5-cache/mail-client/alot-0.3.7-r1 b/metadata/md5-cache/mail-client/alot-0.3.7-r1
new file mode 100644
index 000000000000..4ba3da89020d
--- /dev/null
+++ b/metadata/md5-cache/mail-client/alot-0.3.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Experimental terminal UI for net-mail/notmuch written in Python
+EAPI=5
+HOMEPAGE=https://github.com/pazz/alot
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-python/configobj-4.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygpgme[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-10.2.0 >=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-mail/mailbase >=net-mail/notmuch-0.13[crypt,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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pazz/alot/tarball/0.3.7 -> alot-0.3.7.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=3e646b2a4076d5a564c397fbe5164b18
diff --git a/metadata/md5-cache/media-gfx/dispcalgui-3.0.6.0 b/metadata/md5-cache/media-gfx/dispcalgui-3.0.6.0
new file mode 100644
index 000000000000..651317be74dc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/dispcalgui-3.0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:2.8 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Display Calibration and Characterization powered by Argyll CMS
+EAPI=5
+HOMEPAGE=https://dispcalgui.hoech.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:2.8 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 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://sourceforge/dispcalgui/dispcalGUI-3.0.6.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=8e992553f6917fc1438a3f79683d3f63
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.2.2-r2 b/metadata/md5-cache/media-gfx/geeqie-1.2.2-r2
new file mode 100644
index 000000000000..3f31aae9e4a2
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-1.2.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig dev-util/intltool 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 lightweight GTK image viewer forked from GQview
+EAPI=5
+HOMEPAGE=http://www.geeqie.org
+IUSE=debug doc exif gtk3 jpeg lcms lirc lua tiff xmp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) tiff? ( media-libs/tiff:0 )
+SLOT=0
+SRC_URI=http://www.geeqie.org/geeqie-1.2.2.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c9f1844b0580616855e36909e1f1cb0c
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index 56f85ba85f7a..f898e824238b 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/gettext x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 doc? ( >=kde-frameworks/kapidox-5.14.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/gettext x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 doc? ( >=kde-frameworks/kapidox-5.15.0:5 app-doc/doxygen ) handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Application to create libraries of QPainterPath objects with redering hints
 EAPI=5
 HOMEPAGE=https://userbase.kde.org/SymbolEditor
 IUSE=doc debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1cb1441dd084d1248234ac3f1775ca2c
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.4 b/metadata/md5-cache/media-libs/libsdl2-2.0.4
new file mode 100644
index 000000000000..9af940387d1c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) tslib? ( >=x11-libs/tslib-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(-)?] ) udev? ( >=virtual/libudev-208:=[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.0.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(-)?] >=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(-)?,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXrandr-1.4.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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) X? ( >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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/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=Simple Direct Media Layer
+EAPI=5
+HOMEPAGE=http://www.libsdl.org
+IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver 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 ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) tslib? ( >=x11-libs/tslib-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(-)?] ) udev? ( >=virtual/libudev-208:=[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.0.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(-)?] >=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(-)?,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXrandr-1.4.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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) )
+REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) xinerama? ( X ) xscreensaver? ( X )
+SLOT=0
+SRC_URI=http://www.libsdl.org/release/SDL2-2.0.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=15ae6786438f35010e13184a4b3702f8
diff --git a/metadata/md5-cache/media-libs/mesa-10.2.8 b/metadata/md5-cache/media-libs/mesa-10.2.8
deleted file mode 100644
index d11fb299bd54..000000000000
--- a/metadata/md5-cache/media-libs/mesa-10.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.2.7 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-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(-)?] <sys-devel/llvm-3.6 ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.54[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) llvm? ( video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.3-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(-)?] >=sys-devel/clang-3.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-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(-)?] >=x11-proto/presentproto-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(-)?] ) >=x11-proto/glproto-1.4.16-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xf86driproto-2.1.1-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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=5
-HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic selinux +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux 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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT SGI-B-2.0
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.2.7 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-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(-)?] <sys-devel/llvm-3.6 ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.54[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.54[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.54[video_cards_radeon] )
-REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.2.8/MesaLib-10.2.8.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6705ecea9bc21de284fce23f3024df2f
diff --git a/metadata/md5-cache/media-libs/mesa-10.3.7-r2 b/metadata/md5-cache/media-libs/mesa-10.3.7-r2
deleted file mode 100644
index f7233ea75aa6..000000000000
--- a/metadata/md5-cache/media-libs/mesa-10.3.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-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(-)?] <sys-devel/llvm-3.6 video_cards_radeonsi? ( >=sys-devel/llvm-3.4.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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.56[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) llvm? ( video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.4.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(-)?] >=sys-devel/clang-3.4.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(-)?] >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-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(-)?] >=x11-proto/presentproto-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(-)?] ) >=x11-proto/glproto-1.4.17-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xf86driproto-2.1.1-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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=5
-HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel openmax pic selinux +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT SGI-B-2.0
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.3-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(-)?] <sys-devel/llvm-3.6 video_cards_radeonsi? ( >=sys-devel/llvm-3.4.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(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.56[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.56[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.56[video_cards_radeon] )
-REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.3.7/MesaLib-10.3.7.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b119b5eed7b67046d0b3c8da7d3641d9
diff --git a/metadata/md5-cache/media-libs/mesa-10.6.9 b/metadata/md5-cache/media-libs/mesa-10.6.9
deleted file mode 100644
index e5a6cf586399..000000000000
--- a/metadata/md5-cache/media-libs/mesa-10.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] gbm? ( >=virtual/libudev-215:=[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(-)?] ) dri3? ( >=virtual/libudev-215:=[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(-)?] ) >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[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(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.4.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(-)?] <sys-devel/llvm-3.7 ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-0.35.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.60[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) llvm? ( video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.4.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(-)?] >=sys-devel/clang-3.4.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(-)?] >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-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(-)?] >=x11-proto/presentproto-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(-)?] ) >=x11-proto/glproto-1.4.17-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xf86driproto-2.1.1-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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=5
-HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] gbm? ( >=virtual/libudev-215:=[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(-)?] ) dri3? ( >=virtual/libudev-215:=[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(-)?] ) >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[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(-)?] llvm? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/llvm-3.4.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(-)?] <sys-devel/llvm-3.7 ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-0.35.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.60[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.60[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.60[video_cards_radeon] )
-REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium llvm ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.6.9/mesa-10.6.9.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=eeb5be7ce65c67d6cb07f1922b8496b2
diff --git a/metadata/md5-cache/media-libs/mesa-11.0.8 b/metadata/md5-cache/media-libs/mesa-11.0.8
new file mode 100644
index 000000000000..40824a7e9ddc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-11.0.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) >=sys-devel/llvm-3.4.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-0.35.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.64[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_amdgpu] ) llvm? ( video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.4.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(-)?] >=sys-devel/clang-3.4.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(-)?] >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-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(-)?] >=x11-proto/presentproto-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(-)?] ) >=x11-proto/glproto-1.4.17-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xf86driproto-2.1.1-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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=5
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) >=sys-devel/llvm-3.4.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( || ( >=dev-libs/elfutils-0.155-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libelf-0.8.13-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-0.35.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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(-)?] ) >=x11-libs/libdrm-2.4.64[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_amdgpu] )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/11.0.8/mesa-11.0.8.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ad51656e1fb1f5bde07427b260a713ca
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1 b/metadata/md5-cache/media-libs/openal-1.15.1
deleted file mode 100644
index 14788c079920..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=5
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa alstream coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ccd9dbc12922b29217ba64fd7fd9495
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1-r1 b/metadata/md5-cache/media-libs/openal-1.15.1-r1
deleted file mode 100644
index d03f8d6fbbe0..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.15.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=5
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa alstream coreaudio debug neon oss portaudio pulseaudio 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 ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
-_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d0503c894b8c270c151f8987562b3780
diff --git a/metadata/md5-cache/media-libs/openal-1.16.0 b/metadata/md5-cache/media-libs/openal-1.16.0
deleted file mode 100644
index 12fa0d79adc6..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=5
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa coreaudio debug oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 neon 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 ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.16.0.tar.bz2
-_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2d5c33e75e9fb0ccc9a3d98a8a09e70c
diff --git a/metadata/md5-cache/media-libs/openal-1.17.0 b/metadata/md5-cache/media-libs/openal-1.17.0
deleted file mode 100644
index b08e1cacb65c..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=5
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa coreaudio debug oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 neon 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 ~x86-linux
-LICENSE=LGPL-2+
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.17.0.tar.bz2
-_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a76225320e594b60fa74781a919859b3
diff --git a/metadata/md5-cache/media-libs/openal-1.17.1 b/metadata/md5-cache/media-libs/openal-1.17.1
new file mode 100644
index 000000000000..798f4afa9e5e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=5
+HOMEPAGE=http://kcat.strangesoft.net/openal.html
+IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 neon 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 ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) jack? ( media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.17.1.tar.bz2
+_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0ccc4e60ece978c640d0061839f1fd9c
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.1 b/metadata/md5-cache/media-libs/sdl2-image-2.0.1
new file mode 100644
index 000000000000..fdc13b705e79
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
+DESCRIPTION=Image file loading library
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
+IUSE=gif jpeg png static-libs tiff webp 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
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=a889be7a6802e7354d0db79da39bc76c
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.1 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.1
new file mode 100644
index 000000000000..46d201aa7e2e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=media-libs/libsdl2-2.0.1-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[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(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[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(-)?] ) smpeg? ( >=media-libs/smpeg2-2.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mod? ( modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.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(-)?] ) )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav 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
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[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(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[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(-)?] ) smpeg? ( >=media-libs/smpeg2-2.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mod? ( modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.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(-)?] ) )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) tremor? ( vorbis )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=762dea20da4e9dd8b0617699b743dd8f
diff --git a/metadata/md5-cache/media-libs/sdl2-net-2.0.1 b/metadata/md5-cache/media-libs/sdl2-net-2.0.1
new file mode 100644
index 000000000000..783cbe9d30a7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-net-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl2-2.0.1-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(-)?]
+DESCRIPTION=Simple Direct Media Layer Network Support Library
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_net/index.html
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-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(-)?]
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5999e671cc584072eedea2d4226bb91a
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.13 b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.13
new file mode 100644
index 000000000000..81d73bda915a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl2-2.0.1-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(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
+EAPI=5
+HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
+IUSE=static-libs X 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
+LICENSE=ZLIB
+RDEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl2-2.0.1-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(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.13.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=7c73fa3bb334f291122923ffa6e7a3b6
diff --git a/metadata/md5-cache/media-libs/taglib-1.10 b/metadata/md5-cache/media-libs/taglib-1.10
new file mode 100644
index 000000000000..2b6ea0bf5a98
--- /dev/null
+++ b/metadata/md5-cache/media-libs/taglib-1.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-util/cppunit-1.13.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(-)?] ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A library for reading and editing audio meta data
+EAPI=5
+HOMEPAGE=https://taglib.github.io/
+IUSE=+asf debug examples +mp4 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1 MPL-1.1
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/taglib/taglib/archive/v1.10.tar.gz -> taglib-1.10.tar.gz
+_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5da16176ae0646acdf57bcedaf9e3af2
diff --git a/metadata/md5-cache/media-libs/varconf-0.6.7-r1 b/metadata/md5-cache/media-libs/varconf-0.6.7-r1
index 7da2fb54fb7f..1fada3d70e24 100644
--- a/metadata/md5-cache/media-libs/varconf-0.6.7-r1
+++ b/metadata/md5-cache/media-libs/varconf-0.6.7-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libsigc++-2.0 virtual/pkgconfig
 DESCRIPTION=A configuration system designed for the STAGE server
 EAPI=5
 HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/varconf
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libsigc++-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/varconf-0.6.7.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4576afb99a3a9b31718656281ebec718
+_md5_=f29c3327d733900448dfbfcaa4c817fb
diff --git a/metadata/md5-cache/media-sound/gejengel-0.1.4-r2 b/metadata/md5-cache/media-sound/gejengel-0.1.4-r2
index a59b90863f24..e1c9dcd5668e 100644
--- a/metadata/md5-cache/media-sound/gejengel-0.1.4-r2
+++ b/metadata/md5-cache/media-sound/gejengel-0.1.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight audio player
 EAPI=5
 HOMEPAGE=https://github.com/dirkvdb/gejengel
 IUSE=+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/pangomm:1.4 media-libs/taglib dev-db/sqlite:3 || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[imagemagick] ) mad? ( media-libs/libmad ) flac? ( media-libs/flac[cxx] ) ffmpeg? ( >=virtual/ffmpeg-9 ) audioscrobbler? ( >=media-libs/lastfmlib-0.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://gejengel.googlecode.com/files/gejengel-0.1.4.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e71f1d6dd5aabaf7e4b6c70dbcdb6fd1
+_md5_=cb714bf357971dbd07c35389cfca8500
diff --git a/metadata/md5-cache/media-sound/kid3-3.2.1 b/metadata/md5-cache/media-sound/kid3-3.2.1
index bf0f45bcc479..9d96b06486fe 100644
--- a/metadata/md5-cache/media-sound/kid3-3.2.1
+++ b/metadata/md5-cache/media-sound/kid3-3.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-3.2.1.tar.gz
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-base	0776174f3e754b2f13e1cce401e2ea26	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ab579214194cd29bf64fb5e81cdda19b
+_md5_=e5bbb6b90a47e8a740c9c801f1bcce99
diff --git a/metadata/md5-cache/media-video/kamoso-3.0 b/metadata/md5-cache/media-video/kamoso-3.0
index 6468496e123f..a51cbd8c3240 100644
--- a/metadata/md5-cache/media-video/kamoso-3.0
+++ b/metadata/md5-cache/media-video/kamoso-3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Application to take pictures and videos from your webcam by KDE
 EAPI=5
 HOMEPAGE=https://userbase.kde.org/Kamoso
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta[alsa,theora,vorbis,v4l,xv] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta[alsa,theora,vorbis,v4l,xv] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.0/src/kamoso-3.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=026f4ac9672142177ab97813a6e4e99b
diff --git a/metadata/md5-cache/media-video/kamoso-3.1.0 b/metadata/md5-cache/media-video/kamoso-3.1.0
index 9b993c436f14..bf25005ff752 100644
--- a/metadata/md5-cache/media-video/kamoso-3.1.0
+++ b/metadata/md5-cache/media-video/kamoso-3.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Application to take pictures and videos from your webcam by KDE
 EAPI=5
 HOMEPAGE=https://userbase.kde.org/Kamoso
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdeclarative-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta[alsa,theora,vorbis,v4l,xv] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdeclarative-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 dev-libs/purpose:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/qt-gstreamer[qt5] virtual/libudev:= media-plugins/gst-plugins-meta[alsa,theora,vorbis,v4l,xv] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.1/src/kamoso-3.1.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=d061784f3cf389c116a4e82ea3eebf3b
diff --git a/metadata/md5-cache/media-video/mpv-0.11.0-r1 b/metadata/md5-cache/media-video/mpv-0.11.0-r1
index a520ebdc5450..eb42f41396ef 100644
--- a/metadata/md5-cache/media-video/mpv-0.11.0-r1
+++ b/metadata/md5-cache/media-video/mpv-0.11.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=5
 HOMEPAGE=https://mpv.io/
 IUSE=+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,wayland(-)?] ) iconv? ( virtual/libiconv enca? ( app-i18n/enca ) libguess? ( >=app-i18n/libguess-1.0 ) uchardet? ( dev-libs/uchardet ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage virtual/opengl ) vaapi? ( >=x11-libs/libva-1.2.0[X] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=|| ( cli libmpv ) egl? ( || ( X wayland ) ) enca? ( iconv ) lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) opengl? ( X ) pvr? ( v4l ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( X ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.11.0.tar.gz -> mpv-0.11.0.tar.gz https://waf.io/waf-1.8.12
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	waf-utils	ad1dd5b59c523843eebd3a9934c509ca	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ed55329ffd65a04d3e1127d81ce80f14
+_md5_=9703c43dc7071ecb4f9ec6ec4a0ccadc
diff --git a/metadata/md5-cache/media-video/mpv-0.14.0 b/metadata/md5-cache/media-video/mpv-0.14.0
index 7542fe17d841..cadbd1f6c8ed 100644
--- a/metadata/md5-cache/media-video/mpv-0.14.0
+++ b/metadata/md5-cache/media-video/mpv-0.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=5
 HOMEPAGE=https://mpv.io/
 IUSE=+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv enca? ( app-i18n/enca ) libguess? ( >=app-i18n/libguess-1.0 ) uchardet? ( dev-libs/uchardet ) ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage virtual/opengl ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=|| ( cli libmpv ) egl? ( || ( gbm X wayland ) ) enca? ( iconv ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) opengl? ( X ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.14.0.tar.gz -> mpv-0.14.0.tar.gz https://waf.io/waf-1.8.12
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	waf-utils	ad1dd5b59c523843eebd3a9934c509ca	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e8cebd6e0cd65ac1d0e8cc8a9af33153
+_md5_=18a90304d09532eef6c34b3388215e56
diff --git a/metadata/md5-cache/media-video/mpv-0.9.2-r1 b/metadata/md5-cache/media-video/mpv-0.9.2-r1
index 9669153b45fe..602d20205691 100644
--- a/metadata/md5-cache/media-video/mpv-0.9.2-r1
+++ b/metadata/md5-cache/media-video/mpv-0.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=5
 HOMEPAGE=http://mpv.io/
 IUSE=+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 >=media-libs/libdvdnav-4.2.0 ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.12.1:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lua? ( !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=|| ( cli libmpv ) egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=http://ftp.waf.io/pub/release/waf-1.8.4 https://github.com/mpv-player/mpv/archive/v0.9.2.tar.gz -> mpv-0.9.2.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	waf-utils	ad1dd5b59c523843eebd3a9934c509ca	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=182d5326c2f00206c3261b2751b89c68
+_md5_=0e396cac0f019cd01047488ed9d2be16
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 53edc6021a6b..13a1e07d9cdf 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( cli libmpv ) egl? ( || ( gbm X wayland ) ) enca? ( iconv ) gbm
 SLOT=0
 SRC_URI=https://waf.io/waf-1.8.12
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	git-r3	0961ca04f93a7ae0e4c4a0b2b8c3be99	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	waf-utils	ad1dd5b59c523843eebd3a9934c509ca	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cc18b35bc4b2b3287e4b2ef097ff712e
+_md5_=1f1066502efed710a994b133c6fde0e6
diff --git a/metadata/md5-cache/net-im/gajim-0.16.5 b/metadata/md5-cache/net-im/gajim-0.16.5
index 75331b465f6e..79f8fc84fe48 100644
--- a/metadata/md5-cache/net-im/gajim-0.16.5
+++ b/metadata/md5-cache/net-im/gajim-0.16.5
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( kde-apps/kwalletmanager ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) avahi? ( dbus ) gnome? ( gnome-keyring )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.16/gajim-0.16.5.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd0edc1915541aca725b959bd8ac8d51
+_md5_=5b96b65b403540379e10f05173cb2cf2
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.10 b/metadata/md5-cache/net-im/pidgin-2.10.10
deleted file mode 100644
index 1875c2bcfa82..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.10.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* net-libs/farstream:0.1 media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.15.4 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-proto/scrnsaverproto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=5
-HOMEPAGE=http://pidgin.im/
-IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* net-libs/farstream:0.1 media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.15.4 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ) dbus? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/pidgin/pidgin-2.10.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c2d427cd392e16ebcee38526e6e1bb29
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.12 b/metadata/md5-cache/net-im/pidgin-2.10.12
new file mode 100644
index 000000000000..e10ae3e90a16
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.10.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-proto/scrnsaverproto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=5
+HOMEPAGE=http://pidgin.im/
+IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ) dbus? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.10.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=349d2369bcd36293dcc4f7cd06ea841e
diff --git a/metadata/md5-cache/net-irc/konversation-1.6 b/metadata/md5-cache/net-irc/konversation-1.6
index 4a759b127f60..4e58a9e37579 100644
--- a/metadata/md5-cache/net-irc/konversation-1.6
+++ b/metadata/md5-cache/net-irc/konversation-1.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A user friendly IRC Client
 EAPI=5
 HOMEPAGE=https://kde.org/applications/internet/konversation/ https://konversation.kde.org
 IUSE=+crypt debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.14.0:5 >=kde-frameworks/kbookmarks-5.14.0:5 >=kde-frameworks/kcodecs-5.14.0:5 >=kde-frameworks/kcompletion-5.14.0:5 >=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kdbusaddons-5.14.0:5 >=kde-frameworks/kemoticons-5.14.0:5 >=kde-frameworks/kglobalaccel-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kidletime-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kitemviews-5.14.0:5 >=kde-frameworks/knotifications-5.14.0:5 >=kde-frameworks/knotifyconfig-5.14.0:5 >=kde-frameworks/kparts-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/ktextwidgets-5.14.0:5 >=kde-frameworks/kwallet-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 >=kde-frameworks/solid-5.14.0:5 >=kde-frameworks/sonnet-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext !net-irc/konversation:4 crypt? ( app-crypt/qca:2[openssl] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/karchive-5.15.0:5 >=kde-frameworks/kbookmarks-5.15.0:5 >=kde-frameworks/kcodecs-5.15.0:5 >=kde-frameworks/kcompletion-5.15.0:5 >=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kdbusaddons-5.15.0:5 >=kde-frameworks/kemoticons-5.15.0:5 >=kde-frameworks/kglobalaccel-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kidletime-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kitemviews-5.15.0:5 >=kde-frameworks/knotifications-5.15.0:5 >=kde-frameworks/knotifyconfig-5.15.0:5 >=kde-frameworks/kparts-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/ktextwidgets-5.15.0:5 >=kde-frameworks/kwallet-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 >=kde-frameworks/solid-5.15.0:5 >=kde-frameworks/sonnet-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext !net-irc/konversation:4 crypt? ( app-crypt/qca:2[openssl] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.6/src/konversation-1.6.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=27e1c7f402c05c3a00a805f2cd0c80b1
diff --git a/metadata/md5-cache/net-irc/kvirc-4.4_pre20151218202654 b/metadata/md5-cache/net-irc/kvirc-4.4_pre20151218202654
index 0f0970d5f662..9446317cddf6 100644
--- a/metadata/md5-cache/net-irc/kvirc-4.4_pre20151218202654
+++ b/metadata/md5-cache/net-irc/kvirc-4.4_pre20151218202654
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=kvirc
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl ) phonon? ( media-libs/phonon:0[qt5] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=audiofile? ( oss )
-SLOT=4
+SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/d1e304ba1fdd27645af53573f9ed96b44199dfd3.tar.gz -> kvirc-4.4_pre20151218202654.tar.gz
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a38db14217dbc49bef0ce9aadcfc3629
+_md5_=f183912447084bb85547e2eda5b323bd
diff --git a/metadata/md5-cache/net-irc/kvirc-4.4_pre6250 b/metadata/md5-cache/net-irc/kvirc-4.4_pre6250
index c39ddf779616..d6f1713566bd 100644
--- a/metadata/md5-cache/net-irc/kvirc-4.4_pre6250
+++ b/metadata/md5-cache/net-irc/kvirc-4.4_pre6250
@@ -8,7 +8,7 @@ KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=kvirc
 RDEPEND=>=dev-qt/qtcore-4.6:4 >=dev-qt/qtgui-4.6:4 >=dev-qt/qtsql-4.6:4 sys-libs/zlib x11-libs/libX11 dbus? ( >=dev-qt/qtdbus-4.6:4 ) dcc_video? ( media-libs/libv4l theora? ( media-libs/libogg media-libs/libtheora ) ) kde? ( >=kde-base/kdelibs-4 ) oss? ( audiofile? ( media-libs/audiofile ) ) perl? ( dev-lang/perl ) phonon? ( || ( media-libs/phonon[qt4] >=dev-qt/qtphonon-4.6:4 ) ) ssl? ( dev-libs/openssl ) webkit? ( >=dev-qt/qtwebkit-4.6:4 ) gsm? ( media-sound/gsm ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=audiofile? ( oss ) theora? ( dcc_video )
-SLOT=4
+SLOT=0
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/kvirc-4.4_pre6250.tar.xz
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41eaf0ab205f0c55315cdc49e85d45f2
+_md5_=17581d0a7aabef7d3abcd55d4bcf6aaa
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index fc2dbb905235..d086024f34ed 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -7,6 +7,6 @@ IUSE=audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +
 LICENSE=kvirc
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl ) phonon? ( media-libs/phonon:0[qt5] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=audiofile? ( oss )
-SLOT=4
+SLOT=0
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	0961ca04f93a7ae0e4c4a0b2b8c3be99	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=948ffb0c3b2549f9cb886adf8959935a
+_md5_=bc7aa099d3abffab32bc30892663964e
diff --git a/metadata/md5-cache/net-libs/enet-1.3.13 b/metadata/md5-cache/net-libs/enet-1.3.13
index 745d283ef500..59d5f4d6d051 100644
--- a/metadata/md5-cache/net-libs/enet-1.3.13
+++ b/metadata/md5-cache/net-libs/enet-1.3.13
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=configure install
 DESCRIPTION=relatively thin, simple and robust network communication layer on top of UDP
 EAPI=5
 HOMEPAGE=http://enet.bespin.org/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!net-libs/enet:0
 SLOT=1.3/7
 SRC_URI=http://enet.bespin.org/download/enet-1.3.13.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=73909c659104d0b930c7f540eb815093
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=98bbb56e24896897aca2545b385769c5
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
index 30068a9abf5c..e6ec8b0a1f59 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtdbus:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5] sys-apps/dbus || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtdbus:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5] sys-apps/dbus || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt bindings for the Telepathy logger
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-qt/qtdbus:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5] sys-apps/dbus >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/15.04/src/telepathy-logger-qt-15.04.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=85ab4c6670469951d190965b98994194
diff --git a/metadata/md5-cache/net-misc/electrum-2.1.1 b/metadata/md5-cache/net-misc/electrum-2.1.1
index 8e2f9da6ce10..75a0a94cd9bd 100644
--- a/metadata/md5-cache/net-misc/electrum-2.1.1
+++ b/metadata/md5-cache/net-misc/electrum-2.1.1
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ecdsa-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/slowaes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbkdf2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tlslite[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/socksipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) qrcode? ( media-gfx/zbar[python,v4l,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-lang/python ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( cli gtk3 ncurses qt4 ) cosign? ( qt4 ) fiat? ( qt4 ) greenaddress_it? ( qt4 ) qrcode? ( qt4 ) sync? ( qt4 ) trustedcoin_com? ( qt4 ) vkb? ( qt4 ) || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://download.electrum.org/Electrum-2.1.1.tar.gz
+SRC_URI=https://download.electrum.org/2.1.1/Electrum-2.1.1.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1bf8a0944a936fb42583aa45875cda16
+_md5_=0f8c8bbb891871df44e0310c99aa0827
diff --git a/metadata/md5-cache/net-misc/electrum-2.3.3 b/metadata/md5-cache/net-misc/electrum-2.3.3
index ee628e349d2f..7b672aa38ceb 100644
--- a/metadata/md5-cache/net-misc/electrum-2.3.3
+++ b/metadata/md5-cache/net-misc/electrum-2.3.3
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ecdsa-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/slowaes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbkdf2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tlslite[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/socksipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) qrcode? ( media-gfx/zbar[python,v4l,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-lang/python ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( cli gtk3 ncurses qt4 ) cosign? ( qt4 ) fiat? ( qt4 ) greenaddress_it? ( qt4 ) qrcode? ( qt4 ) sync? ( qt4 ) trustedcoin_com? ( qt4 ) vkb? ( qt4 ) || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://download.electrum.org/Electrum-2.3.3.tar.gz
+SRC_URI=https://download.electrum.org/2.3.3/Electrum-2.3.3.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=56edc0e16080f9300b76d9ecd1472136
+_md5_=9e4b4b0b733e145eaab6595dab57d3d9
diff --git a/metadata/md5-cache/net-misc/electrum-2.5.1 b/metadata/md5-cache/net-misc/electrum-2.5.4
similarity index 96%
rename from metadata/md5-cache/net-misc/electrum-2.5.1
rename to metadata/md5-cache/net-misc/electrum-2.5.4
index 6769e8ccb939..7b69e85096dd 100644
--- a/metadata/md5-cache/net-misc/electrum-2.5.1
+++ b/metadata/md5-cache/net-misc/electrum-2.5.4
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ecdsa[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbkdf2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qrcode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/slowaes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/socksipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tlslite[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] qrcode? ( media-gfx/zbar[python,v4l,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-lang/python ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( cli gtk3 ncurses qt4 ) cosign? ( qt4 ) email? ( qt4 ) fiat? ( qt4 ) greenaddress_it? ( qt4 ) qrcode? ( qt4 ) sync? ( qt4 ) trustedcoin_com? ( qt4 ) vkb? ( qt4 ) || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://download.electrum.org/Electrum-2.5.1.tar.gz
+SRC_URI=https://download.electrum.org/2.5.4/Electrum-2.5.4.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8082a263d744f1859dd25c155b85199c
+_md5_=d4b78092bb7ab820422a6775bdeffcf5
diff --git a/metadata/md5-cache/net-misc/icaclient-13.2.0.322243 b/metadata/md5-cache/net-misc/icaclient-13.2.0.322243
index 88655d1e0a01..194ef31ac668 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.2.0.322243
+++ b/metadata/md5-cache/net-misc/icaclient-13.2.0.322243
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.citrix.com/
 IUSE=nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=icaclient
-RDEPEND=dev-libs/atk dev-libs/glib dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base media-libs/gstreamer media-libs/libcanberra[gtk] media-libs/libogg media-libs/libpng:1.2 media-libs/libvorbis media-libs/speex virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango x11-terms/xterm
+RDEPEND=dev-libs/atk dev-libs/glib dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libpng:1.2 media-libs/libvorbis media-libs/speex virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango x11-terms/xterm
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-13.2.0.322243.tar.gz ) x86? ( linuxx86-13.2.0.322243.tar.gz )
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9715eb4b5dd105f4b9b8a0840f352cdb
+_md5_=aa6ffa2d3971cf5561e41adf89ca8582
diff --git a/metadata/md5-cache/net-misc/icaclient-13.2.1.328635 b/metadata/md5-cache/net-misc/icaclient-13.2.1.328635
index 0426cf0ce92b..db8a89529b99 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.2.1.328635
+++ b/metadata/md5-cache/net-misc/icaclient-13.2.1.328635
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.citrix.com/
 IUSE=nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=icaclient
-RDEPEND=dev-libs/atk dev-libs/glib dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base media-libs/gstreamer media-libs/libcanberra[gtk] media-libs/libogg media-libs/libpng:1.2 media-libs/libvorbis media-libs/speex virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango x11-terms/xterm
+RDEPEND=dev-libs/atk dev-libs/glib dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libpng:1.2 media-libs/libvorbis media-libs/speex virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango x11-terms/xterm
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-13.2.1.328635.tar.gz ) x86? ( linuxx86-13.2.1.328635.tar.gz )
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ff4a693a7fd69c25473fe5fd0dea437
+_md5_=f5863250f4166b198ac371ccef4673da
diff --git a/metadata/md5-cache/net-misc/ntpclient-2015.365 b/metadata/md5-cache/net-misc/ntpclient-2015.365
new file mode 100644
index 000000000000..3bfd820c85df
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpclient-2015.365
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=A NTP (RFC-1305) client for unix-alike computers
+EAPI=6
+HOMEPAGE=http://doolittle.icarus.com/ntpclient/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://doolittle.icarus.com/ntpclient/ntpclient_2015_365.tar.gz -> ntpclient-2015.365.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=36ca8fbff1cc7d6c46c37da24a60b10c
diff --git a/metadata/md5-cache/net-misc/ocsync-0.90.4 b/metadata/md5-cache/net-misc/ocsync-0.90.4
index c769633881a7..7c79c3acd6a5 100644
--- a/metadata/md5-cache/net-misc/ocsync-0.90.4
+++ b/metadata/md5-cache/net-misc/ocsync-0.90.4
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.owncloud.com/download/ocsync-0.90.4.tar.bz2
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cf1c8948f605b15fd305865961fd213b
+_md5_=db2cda45812c3cb17f027949a235526e
diff --git a/metadata/md5-cache/net-misc/strongswan-5.3.4 b/metadata/md5-cache/net-misc/strongswan-5.3.4
index 298bf24a9b7f..5bafebda475a 100644
--- a/metadata/md5-cache/net-misc/strongswan-5.3.4
+++ b/metadata/md5-cache/net-misc/strongswan-5.3.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5 ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
+DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
 DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
 EAPI=5
 HOMEPAGE=http://www.strongswan.org/
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
 KEYWORDS=amd64 arm ppc ~ppc64 x86
 LICENSE=GPL-2 RSA DES
-RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5 ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-misc/libreswan
+RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-misc/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.3.4.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=08be13751b61b98d523b8630af5b96e2
+_md5_=a4c04d89931d7bce177f431bd1303f06
diff --git a/metadata/md5-cache/net-misc/strongswan-5.3.4-r1 b/metadata/md5-cache/net-misc/strongswan-5.3.4-r1
index 1d0b044f5049..cd81a9f690a4 100644
--- a/metadata/md5-cache/net-misc/strongswan-5.3.4-r1
+++ b/metadata/md5-cache/net-misc/strongswan-5.3.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5 ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
+DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/linux-sources sys-kernel/linux-headers virtual/pkgconfig
 DESCRIPTION=IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
 EAPI=5
 HOMEPAGE=http://www.strongswan.org/
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 RSA DES
-RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5 ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-misc/libreswan
+RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-misc/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.3.4.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=53e231c5c3bd3368cc6de7fbc0cbac58
+_md5_=0c1644f32de566f4198a8816f8e42d8a
diff --git a/metadata/md5-cache/net-misc/vde-2.2.2-r1 b/metadata/md5-cache/net-misc/vde-2.2.2-r1
new file mode 100644
index 000000000000..2a251575c4a2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/vde-2.2.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
+EAPI=5
+HOMEPAGE=http://vde.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/vde/vde2-2.2.2.tar.bz2
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=d45d6abd000f884f0029649423cf18ff
diff --git a/metadata/md5-cache/net-misc/vde-2.3.1 b/metadata/md5-cache/net-misc/vde-2.3.1
deleted file mode 100644
index 6603355eb77e..000000000000
--- a/metadata/md5-cache/net-misc/vde-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl )
-DESCRIPTION=vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
-EAPI=4
-HOMEPAGE=http://vde.sourceforge.net/
-IUSE=pcap ssl static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/vde/vde2-2.3.1.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=5b39e3305fda50785a95b3777f450b89
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2 b/metadata/md5-cache/net-misc/vde-2.3.2
deleted file mode 100644
index bcdcdee4eea6..000000000000
--- a/metadata/md5-cache/net-misc/vde-2.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl )
-DESCRIPTION=vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
-EAPI=5
-HOMEPAGE=http://vde.sourceforge.net/
-IUSE=pcap python ssl static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/vde/vde2-2.3.2.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=9ad043932b78ec35c881d8884088b4bb
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2-r1 b/metadata/md5-cache/net-misc/vde-2.3.2-r1
deleted file mode 100644
index 1367be6d045f..000000000000
--- a/metadata/md5-cache/net-misc/vde-2.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=pcap? ( net-libs/libpcap ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) ssl? ( dev-libs/openssl )
-DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
-EAPI=5
-HOMEPAGE=http://vde.sourceforge.net/
-IUSE=pcap python ssl static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=pcap? ( net-libs/libpcap ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)] ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/vde/vde2-2.3.2.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=329043bebd2a1418de45620dcc0dcd9a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.01.01 b/metadata/md5-cache/net-misc/youtube-dl-2016.01.01
index 7db18c59d78b..e55bb9d7294e 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.01.01
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.01.01
@@ -4,11 +4,11 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=5
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2016.01.01/youtube-dl-2016.01.01.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3b4e05bb9e3685d19f09fa90c40f3b78
+_md5_=f4b7237aaca0c4643c99842235c302c9
diff --git a/metadata/md5-cache/net-nds/nsscache-0.30-r1 b/metadata/md5-cache/net-nds/nsscache-0.30-r1
new file mode 100644
index 000000000000..2a26274be946
--- /dev/null
+++ b/metadata/md5-cache/net-nds/nsscache-0.30-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=commandline tool to sync directory services to local cache
+EAPI=5
+HOMEPAGE=https://github.com/google/nsscache
+IUSE=nssdb nsscache python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] nssdb? ( sys-libs/nss-db ) nsscache? ( >=sys-auth/libnss-cache-0.10 ) 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 ) || ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/nsscache/archive/version/0.30.tar.gz -> nsscache-0.30.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=a24b67e718d715dca938a3e250fe9007
diff --git a/metadata/md5-cache/net-news/liferea-1.10.16 b/metadata/md5-cache/net-news/liferea-1.10.16
new file mode 100644
index 000000000000..19a1acbf8caa
--- /dev/null
+++ b/metadata/md5-cache/net-news/liferea-1.10.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.26.0:2 dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk] >=net-libs/libsoup-2.28.2:2.4 dev-libs/libunique:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.7.0:3 >=gnome-base/gconf-1.1.9:2 gnome-base/gsettings-desktop-schemas >=net-libs/webkit-gtk-1.6.1:3 >=x11-libs/pango-1.4.0 ayatana? ( dev-libs/libindicate ) libnotify? ( >=x11-libs/libnotify-0.3.2 ) dev-util/intltool 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+EAPI=5
+HOMEPAGE=http://liferea.sourceforge.net/
+IUSE=ayatana libnotify
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.26.0:2 dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk] >=net-libs/libsoup-2.28.2:2.4 dev-libs/libunique:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.7.0:3 >=gnome-base/gconf-1.1.9:2 gnome-base/gsettings-desktop-schemas >=net-libs/webkit-gtk-1.6.1:3 >=x11-libs/pango-1.4.0 ayatana? ( dev-libs/libindicate ) libnotify? ( >=x11-libs/libnotify-0.3.2 )
+SLOT=0
+SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.10.16/liferea-1.10.16.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	dbab14f029665c254b55ec10443917e2	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=1d16a4b2d190c23ad60d2f059515d772
diff --git a/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r2 b/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r3
similarity index 98%
rename from metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r2
rename to metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r3
index 3e216f3db568..22d77d0cd697 100644
--- a/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r2
+++ b/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2-r3
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] dev-libs/protobu
 SLOT=0
 SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.2.2.tar.gz -> litecoin-0.10.2.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde4-functions	ff0ade3e22b20c6dc894347fad047336	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fcc01c7d48557e3a336314a627550cc9
+_md5_=af2ccd127bb74210499818ddf3a3a9c5
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r3 b/metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r4
similarity index 97%
rename from metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r3
rename to metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r4
index 3bf7cc80cf29..8dff1c2caea6 100644
--- a/metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r3
+++ b/metadata/md5-cache/net-p2p/litecoind-0.10.2.2-r4
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app
 SLOT=0
 SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.2.2.tar.gz -> litecoin-0.10.2.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a409e2f78e5f6ec0c946921d215a25c
+_md5_=9a7da4a99acbb8166b1e3114e5faacd1
diff --git a/metadata/md5-cache/net-wireless/neard-0.11 b/metadata/md5-cache/net-wireless/neard-0.11
deleted file mode 100644
index 97cc1835f588..000000000000
--- a/metadata/md5-cache/net-wireless/neard-0.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.28:2 dev-libs/libnl >=sys-apps/dbus-1.2.24
-DESCRIPTION=Near Field Communication (NFC) management daemon
-EAPI=4
-HOMEPAGE=https://01.org/linux-nfc/
-IUSE=tools
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28:2 dev-libs/libnl >=sys-apps/dbus-1.2.24
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/nfc/neard-0.11.tar.xz
-_md5_=d5845294a08e6bcc181a428b89841429
diff --git a/metadata/md5-cache/net-wireless/reaver-1.4 b/metadata/md5-cache/net-wireless/reaver-1.4
deleted file mode 100644
index a24be84e9c9c..000000000000
--- a/metadata/md5-cache/net-wireless/reaver-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libpcap dev-db/sqlite:3
-DESCRIPTION=Brute force attack against Wifi Protected Setup
-EAPI=4
-HOMEPAGE=https://code.google.com/p/reaver-wps/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d7e1425febc52ea82112f5944396df75
diff --git a/metadata/md5-cache/net-wireless/reaver-1.4-r1 b/metadata/md5-cache/net-wireless/reaver-1.4-r1
deleted file mode 100644
index 53df9cd16888..000000000000
--- a/metadata/md5-cache/net-wireless/reaver-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libpcap dev-db/sqlite:3
-DESCRIPTION=Brute force attack against Wifi Protected Setup
-EAPI=4
-HOMEPAGE=https://code.google.com/p/reaver-wps/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8079dbf450ed8ab05478cfd25232d944
diff --git a/metadata/md5-cache/sci-biology/rebase-1509 b/metadata/md5-cache/sci-biology/rebase-1509
deleted file mode 100644
index c8a85ff4409b..000000000000
--- a/metadata/md5-cache/sci-biology/rebase-1509
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-DESCRIPTION=A restriction enzyme database
-EAPI=5
-HOMEPAGE=http://rebase.neb.com
-IUSE=emboss minimal
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1509.tar.xz
-_md5_=1e1927f905332a2c2d31dfbb9f8a0d3b
diff --git a/metadata/md5-cache/sci-chemistry/mongochem-0.7.0 b/metadata/md5-cache/sci-chemistry/mongochem-0.7.0-r1
similarity index 61%
rename from metadata/md5-cache/sci-chemistry/mongochem-0.7.0
rename to metadata/md5-cache/sci-chemistry/mongochem-0.7.0-r1
index 45d367b98f8a..089a17b0ab86 100644
--- a/metadata/md5-cache/sci-chemistry/mongochem-0.7.0
+++ b/metadata/md5-cache/sci-chemistry/mongochem-0.7.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-db/mongodb[sharedclient] dev-libs/boost[threads] sci-libs/avogadrolibs[qt4] sci-libs/chemkit sci-libs/vtk[qt4,rendering] sci-chemistry/molequeue dev-util/ninja >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-libs/boost[threads] dev-libs/mongo-cxx-driver sci-libs/avogadrolibs[qt4] sci-libs/chemkit sci-libs/vtk[qt4,rendering] sci-chemistry/molequeue dev-util/ninja >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Application for managing large collections of chemical data
 EAPI=5
 HOMEPAGE=http://www.openchemistry.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-db/mongodb[sharedclient] dev-libs/boost[threads] sci-libs/avogadrolibs[qt4] sci-libs/chemkit sci-libs/vtk[qt4,rendering] sci-chemistry/molequeue
+RDEPEND=dev-libs/boost[threads] dev-libs/mongo-cxx-driver sci-libs/avogadrolibs[qt4] sci-libs/chemkit sci-libs/vtk[qt4,rendering] sci-chemistry/molequeue
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/mongochem/archive/df36ebce92024dd4fd1c70eb37eb84e4c51120ff.tar.gz -> mongochem-0.7.0.tar.gz
 _eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7de5eb678166de78463f7b6a6ce88802
+_md5_=68b50d0f22a73986792a09a2701732ac
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.5.1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.5.1
new file mode 100644
index 000000000000..667c524879dd
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 >=sci-geosciences/routino-3.0_p1 sci-libs/gdal sci-libs/proj dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=GPS mapping utility
+EAPI=5
+HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 >=sci-geosciences/routino-3.0_p1 sci-libs/gdal sci-libs/proj
+SLOT=0
+SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.5.1.tar.gz
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f3078346fab3b4958ca3f786352f5d39
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.0_p1 b/metadata/md5-cache/sci-geosciences/routino-3.0_p1
new file mode 100644
index 000000000000..b2de6c6746b6
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/routino-3.0_p1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure
+DESCRIPTION=Routing application based on openstreetmap data
+EAPI=6
+HOMEPAGE=http://www.routino.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=!<sci-geosciences/qmapshack-1.5
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/routino-3.0_p1.tgz
+_md5_=2cb1551af426f6b7fb6e030f43cc952c
diff --git a/metadata/md5-cache/sci-libs/blas-reference-20070226-r4 b/metadata/md5-cache/sci-libs/blas-reference-20070226-r4
index e33f710b3b23..72c6ed56eba2 100644
--- a/metadata/md5-cache/sci-libs/blas-reference-20070226-r4
+++ b/metadata/md5-cache/sci-libs/blas-reference-20070226-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Basic Linear Algebra Subprograms F77 reference implementations
 EAPI=5
 HOMEPAGE=http://www.netlib.org/blas/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=app-eselect/eselect-blas doc? ( app-doc/blas-docs ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	fortran-2	d31b3a9fd39520b0150a4fed638b369e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5ee00d929fcb9561394b32609d281df5
+_md5_=e99be19e36382e89a36dfdeb9d961353
diff --git a/metadata/md5-cache/sci-mathematics/nestedsums-1.4.12-r1 b/metadata/md5-cache/sci-mathematics/nestedsums-1.4.12-r1
index 56d8edfb6790..d7866c2daf78 100644
--- a/metadata/md5-cache/sci-mathematics/nestedsums-1.4.12-r1
+++ b/metadata/md5-cache/sci-mathematics/nestedsums-1.4.12-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A GiNaC-based library for symbolic expansion of certain transcendent
 EAPI=3
 HOMEPAGE=http://wwwthep.physik.uni-mainz.de/~stefanw/nestedsums/
 IUSE=doc
-KEYWORDS=~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sci-mathematics/ginac-1.5
 SLOT=0
 SRC_URI=http://wwwthep.physik.uni-mainz.de/~stefanw/download/nestedsums-1.4.12.tar.gz
-_md5_=6173ba55bc0c446cb0ed79ecfc3e34f5
+_md5_=e1102c745a4cb88dadb3c7934c20a9eb
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r10 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r10
index 51626e4e9623..a9b77312510c 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r10
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r10
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.201
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20141203.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20141203-r10.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	selinux-policy-2	de3221b44061d1a089c15c628b625d38	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f1f7d04a59bec0d5dd1051131f49f7a1
+_md5_=6ec3f2d6845eb3c31bc4b13bd4b7a9cf
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r9 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r9
index dc60d8d36973..f351cffd7fec 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r9
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20141203-r9
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.201
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20141203.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	selinux-policy-2	de3221b44061d1a089c15c628b625d38	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f1f7d04a59bec0d5dd1051131f49f7a1
+_md5_=6ec3f2d6845eb3c31bc4b13bd4b7a9cf
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20151208-r1 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20151208-r1
index a3cca252bba1..9d622a84539d 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20151208-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20151208-r1
@@ -9,4 +9,4 @@ RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.201
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-2.20151208.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20151208-r1.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	selinux-policy-2	de3221b44061d1a089c15c628b625d38	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=41284f32230eea43b54d6fcac17d70ac
+_md5_=0f4adeb05763549abe4ce1ba12ead664
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
index 699bc85c4ac2..66cc218bedfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	git-r3	0961ca04f93a7ae0e4c4a0b2b8c3be99	multilib	3972ca401cf7dbb430df9995f5d8d580	selinux-policy-2	de3221b44061d1a089c15c628b625d38	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=41284f32230eea43b54d6fcac17d70ac
+_md5_=0f4adeb05763549abe4ce1ba12ead664
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
index f379b18c86d8..be7576801ec0 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-3.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=I2C tools for bus probing, chip dumping, register-level access helpe
 EAPI=5
 HOMEPAGE=http://www.lm-sensors.org/wiki/I2CTools
 IUSE=python python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-3.1.1.tar.bz2
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9e4f1438202028ccdcd56777b2ae6fc4
+_md5_=7f3365bcc27cf03674e4038b09716575
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.4.1 b/metadata/md5-cache/sys-apps/pciutils-3.4.1
new file mode 100644
index 000000000000..bf46404185b4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pciutils-3.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) udev? ( >=virtual/libudev-208[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(-)?] ) kmod? ( virtual/pkgconfig )
+DESCRIPTION=Various utilities dealing with the PCI bus
+EAPI=5
+HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwids abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.4.1.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=17d53379a8c0a6c3bc92086b2468e15d
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.26 b/metadata/md5-cache/sys-apps/portage-2.2.26
index f013c326b6ab..6e9a951fd29a 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.26
+++ b/metadata/md5-cache/sys-apps/portage-2.2.26
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc +ipc linguas_ru selinux xattr python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
-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
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_pypy? ( virtual/pypy:0=[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.26.tar.bz2 https://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.26.tar.bz2
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=424d6412b59450ad8f93554cbb5b8e39
+_md5_=043b7aa32ef0afae88ea3bbb81a89ac2
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.0.0-r1 b/metadata/md5-cache/sys-auth/consolekit-1.0.0-r1
index a0f466ecf5c2..43efc02198ce 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.0.0-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=5
 HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 http://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl cgroups debug doc kernel_linux pam policykit selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.0.0/ConsoleKit2-1.0.0.tar.bz2 mirror://debian/pool/main/c/consolekit/consolekit_0.4.6-4.debian.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=63d7672aab430d4497d28d3b9b0100d9
+_md5_=8a869bb36154e18b485bce249e573204
diff --git a/metadata/md5-cache/sys-block/partitionmanager-1.2.1 b/metadata/md5-cache/sys-block/partitionmanager-1.2.1
index 1c1c8658869a..8d74f8a0fc34 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-1.2.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-1.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE utility for management of partitions and file systems
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/kcrash-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kiconthemes-5.14.0:5 >=kde-frameworks/kio-5.14.0:5 >=kde-frameworks/kjobwidgets-5.14.0:5 >=kde-frameworks/kservice-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kwindowsystem-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/kcrash-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kiconthemes-5.15.0:5 >=kde-frameworks/kio-5.15.0:5 >=kde-frameworks/kjobwidgets-5.15.0:5 >=kde-frameworks/kservice-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kwindowsystem-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/1.2.1/src/partitionmanager-1.2.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=50728d3e9ee7a37469d029c7603256f6
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.8.2 b/metadata/md5-cache/sys-firmware/seabios-1.8.2
index 3f3937aeea32..70a25b0899a3 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.8.2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.8.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=amd64? ( x86? ( !binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=5
 HOMEPAGE=http://www.seabios.org
 IUSE=+binary debug +seavgabios
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary ) ppc? ( binary ) ppc64? ( binary )
+REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( http://code.coreboot.org/p/seabios/downloads/get/seabios-1.8.2.tar.gz ) binary? ( mirror://gentoo/bios.bin-1.8.2.xz seavgabios? ( mirror://gentoo/seavgabios-1.8.2.tar.xz ) )
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f9e979b417947aa3584339b20c4542bb
+_md5_=442523326db18363ccaa40c88f829bf1
diff --git a/metadata/md5-cache/sys-kernel/dracut-044 b/metadata/md5-cache/sys-kernel/dracut-044
new file mode 100644
index 000000000000..adc76c27e0af
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-044
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Generic initramfs generation tool
+EAPI=5
+HOMEPAGE=https://dracut.wiki.kernel.org
+IUSE=debug selinux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	d9bd2ddd85a58e470b49ca997e255a4c	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b9135192e0deb95fbb1e06d21169aa77
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.4_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.4_rc8
new file mode 100644
index 000000000000..23dccfda6e27
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.4_rc8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~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=4.4_rc8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.4-rc8.xz mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kernel-2	ef694b0e1e5876dc1f8cb80992dd7cb9	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0ea488757d8676d39e925bf8584dc22f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.51
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.12.51
index 2ba341bb8003..1476ebb8db8d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.50
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.51
@@ -8,7 +8,7 @@ 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.50
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.50.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
+SLOT=3.12.51
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.51.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kernel-2	ef694b0e1e5876dc1f8cb80992dd7cb9	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.25
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.18.25
index d5ebdbd2a153..a6c223487830 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.23
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.25
@@ -8,7 +8,7 @@ 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.18.23
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.23.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
+SLOT=3.18.25
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.25.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	kernel-2	ef694b0e1e5876dc1f8cb80992dd7cb9	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935bbb694ae5475a82e7aadf08914b06
diff --git a/metadata/md5-cache/sys-libs/libnih-1.0.3-r3 b/metadata/md5-cache/sys-libs/libnih-1.0.3-r3
index 739705eefa38..66170ee954dd 100644
--- a/metadata/md5-cache/sys-libs/libnih-1.0.3-r3
+++ b/metadata/md5-cache/sys-libs/libnih-1.0.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Light-weight 'standard library' of C functions
 EAPI=4
 HOMEPAGE=https://launchpad.net/libnih
 IUSE=+dbus nls static-libs +threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )
 SLOT=0
 SRC_URI=https://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e99daa52b60a091eb782aa900166e70f
+_md5_=01a0e647f55766fecb1b9028e9ca1f0c
diff --git a/metadata/md5-cache/sys-libs/newlib-2.3.0.20160104 b/metadata/md5-cache/sys-libs/newlib-2.3.0.20160104
new file mode 100644
index 000000000000..0e327c78a7e3
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/newlib-2.3.0.20160104
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DESCRIPTION=Newlib is a C library intended for use on embedded systems
+EAPI=4
+HOMEPAGE=http://sourceware.org/newlib/
+IUSE=nls threads unicode crosscompile_opts_headers-only
+KEYWORDS=-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=NEWLIB LIBGLOSS GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/newlib/newlib-2.3.0.20160104.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=3f675f431f5c99887f4d1bf7fca25783
diff --git a/metadata/md5-cache/www-apps/bugzilla-4.4.11 b/metadata/md5-cache/www-apps/bugzilla-4.4.11
index 9f1c4f4b4f46..41873398dfce 100644
--- a/metadata/md5-cache/www-apps/bugzilla-4.4.11
+++ b/metadata/md5-cache/www-apps/bugzilla-4.4.11
@@ -4,11 +4,11 @@ DESCRIPTION=Bugzilla is the Bug-Tracking System from the Mozilla project
 EAPI=5
 HOMEPAGE=https://www.bugzilla.org
 IUSE=modperl extras graphviz mysql postgres sqlite test modperl vhosts
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=virtual/httpd-cgi:* >=dev-lang/perl-5.10.1:* >=dev-perl/CGI-3.510:* virtual/perl-Digest-SHA:* >=dev-perl/DateTime-0.50:* >=dev-perl/DateTime-TimeZone-0.71:* >=dev-perl/DBI-1.601:* >=dev-perl/Template-Toolkit-2.22:* >=dev-perl/Email-Send-2.190:* >=dev-perl/Email-MIME-1.904:* dev-perl/URI:* >=dev-perl/List-MoreUtils-0.32:* dev-perl/Math-Random-ISAAC:* postgres? ( >=dev-perl/DBD-Pg-1.49:* ) mysql? ( >=dev-perl/DBD-mysql-4.00.5:* ) sqlite? ( >=dev-perl/DBD-SQLite-1.29:* ) extras? ( >=dev-perl/GD-2.35[png,truetype] >=dev-perl/Chart-2.4.1:* dev-perl/Template-GD:* dev-perl/GDTextUtil:* dev-perl/GDGraph:* dev-perl/XML-Twig:* >=dev-perl/MIME-tools-5.427:* dev-perl/libwww-perl:* >=dev-perl/PatchReader-0.9.6:* dev-perl/perl-ldap:* dev-perl/RadiusPerl:* dev-perl/Authen-SASL:* >=dev-perl/SOAP-Lite-0.712:* dev-perl/JSON-RPC:* >=dev-perl/JSON-XS-2.0:* dev-perl/Test-Taint:* >=dev-perl/HTML-Parser-3.67:* dev-perl/HTML-Scrubber:* >=virtual/perl-Encode-2.21:* dev-perl/Encode-Detect:* dev-perl/Email-MIME-Attachment-Stripper:* dev-perl/Email-Reply:* dev-perl/TheSchwartz:* dev-perl/Daemon-Generic:* dev-perl/File-MimeInfo:* || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] ) dev-perl/MIME-tools:* ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.96:* ) graphviz? ( media-gfx/graphviz:* ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=4.4.11
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.4.11.tar.gz
 _eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=4ae96bbfe430bcdea276976557e626ba
+_md5_=947d94bbec45b8809b15dea8172386ae
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.2 b/metadata/md5-cache/www-apps/bugzilla-5.0.2
index 5885c9cb399b..952d67da1d5e 100644
--- a/metadata/md5-cache/www-apps/bugzilla-5.0.2
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Bugzilla is the Bug-Tracking System from the Mozilla project
 EAPI=5
 HOMEPAGE=https://www.bugzilla.org
 IUSE=modperl extras graphviz mysql postgres sqlite test modperl vhosts
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=virtual/httpd-cgi:* >=dev-lang/perl-5.10.1:* >=dev-perl/CGI-3.510:* virtual/perl-Digest-SHA:* >=dev-perl/TimeDate-1.16:* >=dev-perl/DateTime-0.50:* >=dev-perl/DateTime-TimeZone-0.71:* >=dev-perl/DBI-1.601:* >=dev-perl/Template-Toolkit-2.22:* >=dev-perl/Email-Send-2.190:* >=dev-perl/Email-Sender-1.300.11:* >=dev-perl/File-Slurp-9999.190.0-r1:* >=dev-perl/Email-MIME-1.904:* >=dev-perl/JSON-XS-2.340-r1:* dev-perl/URI:* >=dev-perl/List-MoreUtils-0.22:* virtual/perl-File-Path:* virtual/perl-Scalar-List-Utils:* >=virtual/perl-File-Spec-3.27.01:* >=virtual/perl-MIME-Base64-3.07:* dev-perl/Math-Random-ISAAC:* postgres? ( >=dev-perl/DBD-Pg-1.49:* ) mysql? ( >=dev-perl/DBD-mysql-4.00.5:* ) sqlite? ( >=dev-perl/DBD-SQLite-1.29:* ) extras? ( >=dev-perl/GD-2.35[png,truetype] >=dev-perl/Chart-2.4.1:* dev-perl/Template-GD:* dev-perl/GDTextUtil:* dev-perl/GDGraph:* dev-perl/XML-Twig:* >=dev-perl/MIME-tools-5.427:* dev-perl/libwww-perl:* >=dev-perl/PatchReader-0.9.6:* dev-perl/perl-ldap:* dev-perl/RadiusPerl:* dev-perl/Authen-SASL:* >=dev-perl/SOAP-Lite-0.712:* dev-perl/JSON-RPC:* >=dev-perl/JSON-XS-2.0:* dev-perl/Test-Taint:* >=dev-perl/HTML-Parser-3.67:* dev-perl/HTML-Scrubber:* >=virtual/perl-Encode-2.21:* dev-perl/Encode-Detect:* dev-perl/Email-MIME-Attachment-Stripper:* dev-perl/Email-Reply:* dev-perl/TheSchwartz:* dev-perl/Daemon-Generic:* dev-perl/File-MimeInfo:* || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] ) dev-perl/MIME-tools:* ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.96:* ) graphviz? ( media-gfx/graphviz:* ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=5.0.2
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.2.tar.gz
 _eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=7ea0ad40b33f862569208554e2d0f5d5
+_md5_=a0753c6e64846ea99bec042c988f3412
diff --git a/metadata/md5-cache/www-client/seamonkey-2.39 b/metadata/md5-cache/www-client/seamonkey-2.39
index 1099dba0d7d8..3d3daa9e8e3c 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.39
+++ b/metadata/md5-cache/www-client/seamonkey-2.39
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( gstreamer gstreamer-0 )
 SLOT=0
 SRC_URI=linguas_be? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.be.langpack.xpi -> seamonkey-2.39-be.xpi ) linguas_ca? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.ca.langpack.xpi -> seamonkey-2.39-ca.xpi ) linguas_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.cs.langpack.xpi -> seamonkey-2.39-cs.xpi ) linguas_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.de.langpack.xpi -> seamonkey-2.39-de.xpi ) linguas_en_GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.en-GB.langpack.xpi -> seamonkey-2.39-en-GB.xpi ) linguas_es_AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.es-AR.langpack.xpi -> seamonkey-2.39-es-AR.xpi ) linguas_es_ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.es-ES.langpack.xpi -> seamonkey-2.39-es-ES.xpi ) linguas_fi? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.fi.langpack.xpi -> seamonkey-2.39-fi.xpi ) linguas_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.fr.langpack.xpi -> seamonkey-2.39-fr.xpi ) linguas_gl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.gl.langpack.xpi -> seamonkey-2.39-gl.xpi ) linguas_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.hu.langpack.xpi -> seamonkey-2.39-hu.xpi ) linguas_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.it.langpack.xpi -> seamonkey-2.39-it.xpi ) linguas_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.ja.langpack.xpi -> seamonkey-2.39-ja.xpi ) linguas_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.lt.langpack.xpi -> seamonkey-2.39-lt.xpi ) linguas_nb_NO? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.nb-NO.langpack.xpi -> seamonkey-2.39-nb-NO.xpi ) linguas_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.nl.langpack.xpi -> seamonkey-2.39-nl.xpi ) linguas_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.pl.langpack.xpi -> seamonkey-2.39-pl.xpi ) linguas_pt_PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.pt-PT.langpack.xpi -> seamonkey-2.39-pt-PT.xpi ) linguas_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.ru.langpack.xpi -> seamonkey-2.39-ru.xpi ) linguas_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.sk.langpack.xpi -> seamonkey-2.39-sk.xpi ) linguas_sv_SE? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.sv-SE.langpack.xpi -> seamonkey-2.39-sv-SE.xpi ) linguas_tr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.tr.langpack.xpi -> seamonkey-2.39-tr.xpi ) linguas_uk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.uk.langpack.xpi -> seamonkey-2.39-uk.xpi ) linguas_zh_CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.zh-CN.langpack.xpi -> seamonkey-2.39-zh-CN.xpi ) linguas_zh_TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.39/langpack/seamonkey-2.39.zh-TW.langpack.xpi -> seamonkey-2.39-zh-TW.xpi ) https://archive.mozilla.org/pub/seamonkey/releases/2.39/source/seamonkey-2.39.source.tar.xz -> seamonkey-2.39.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-42.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.33-patches-01.tar.xz crypt? ( https://www.enigmail.net/download/source/enigmail-1.8.2.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	mozconfig-v6.42	b6e876fc7d2d8276dc56667fb0add5c3	mozcoreconf-v3	4cfc8ce74fdb5f45ec03f00451b2a3ff	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas	f8b09a9eb2d47862b6df38999a9d6098	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=58b12e871eac7a1e9b3bbcf34d8868e2
+_md5_=a328a71bfa7f05fea30cda7e494f7a00
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
index c981fc56a1a0..f850848f55c4 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php pypy python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php pypy python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_gevent? ( >=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_gevent? ( >=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) )
 REQUIRED_USE=|| ( cgi mono perl lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.11.2.tar.gz -> uwsgi-2.0.11.2.tar.gz
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1178dbf6bd106f206cbfe694c8dff5a5
+_md5_=dad7de7ab4bc9ae334b03bef6e8f7ea7
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.12 b/metadata/md5-cache/www-servers/uwsgi-2.0.12
index fabc4987e969..1780d71d4601 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.12
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.12
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php pypy python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 php_targets_php7-0 elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php pypy python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 php_targets_php7-0 elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_gevent? ( >=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] ) python_gevent? ( >=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
 REQUIRED_USE=|| ( cgi mono perl lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.12.tar.gz -> uwsgi-2.0.12.tar.gz
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c685a21208fb0f9b7df6c65a7a4d0984
+_md5_=db36ab59cda62740d35a594d6db61b01
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.9 b/metadata/md5-cache/www-servers/uwsgi-2.0.9
index d280bcef172f..bde8baeaee52 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.9
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.9
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 php_targets_php5-4 php_targets_php5-5 elibc_FreeBSD ruby_targets_ruby20
+IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl lua php python python_asyncio python_gevent ruby apache2 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 php_targets_php5-4 php_targets_php5-5 elibc_FreeBSD ruby_targets_ruby20
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_gevent? ( >=dev-python/gevent-1.0_beta2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_rsyslog? ( app-admin/rsyslog ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-4? ( dev-lang/php:5.4[embed] ) php_targets_php5-5? ( dev-lang/php:5.5[embed] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_gevent? ( >=dev-python/gevent-1.0_beta2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
 REQUIRED_USE=|| ( cgi mono perl lua php python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_router_xmldir? ( xml ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.9.tar.gz -> uwsgi-2.0.9.tar.gz
 _eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-utils-2	5f1bd1f8baff3ee957cb72c75c3949f2	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	74e9367fec569b8fe0935b103506d117	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=862e5b5bb782a75c2ad10a0909baf4a8
+_md5_=25afc976e7b1a47455961626f164c12d
diff --git a/metadata/md5-cache/x11-misc/bbrun-1.6-r1 b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
index 5a90c5012d00..f7927fe09754 100644
--- a/metadata/md5-cache/x11-misc/bbrun-1.6-r1
+++ b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.darkops.net/bbrun/bbrun-1.6.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fc1fffb571e1e35c29b83f8a7560c6bf
+_md5_=b4e2f37955be27991626b4e796512625
diff --git a/metadata/md5-cache/x11-misc/i3status-2.10 b/metadata/md5-cache/x11-misc/i3status-2.10
new file mode 100644
index 000000000000..289e71aebc59
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/i3status-2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile postinst prepare
+DEPEND=dev-libs/confuse dev-libs/libnl:3 >=dev-libs/yajl-2.0.2 media-libs/alsa-lib media-sound/pulseaudio app-text/asciidoc virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=generates a status bar for dzen2, xmobar or similar
+EAPI=5
+HOMEPAGE=http://i3wm.org/i3status/
+IUSE=+filecaps
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/confuse dev-libs/libnl:3 >=dev-libs/yajl-2.0.2 media-libs/alsa-lib media-sound/pulseaudio
+SLOT=0
+SRC_URI=http://i3wm.org/i3status/i3status-2.10.tar.bz2
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=78cb13a470b1213f59df4cad9387de93
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.0.0 b/metadata/md5-cache/x11-misc/kronometer-2.0.0
index 1469c265bf1c..11f6509470b6 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.0.0
+++ b/metadata/md5-cache/x11-misc/kronometer-2.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KF5-based stopwatch application
 EAPI=5
 HOMEPAGE=http://www.aelog.org/kronometer/
 IUSE=debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.0.0/src/kronometer-2.0.0.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ba420f8f5244c0649d031071d1888e6
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.0.1 b/metadata/md5-cache/x11-misc/kronometer-2.0.1
index 6704092e3a93..e9c3fa821ac4 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.0.1
+++ b/metadata/md5-cache/x11-misc/kronometer-2.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.14.0:5 handbook? ( >=kde-frameworks/kdoctools-5.14.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.15.0:5 handbook? ( >=kde-frameworks/kdoctools-5.15.0:5 ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KF5-based stopwatch application
 EAPI=5
 HOMEPAGE=http://www.aelog.org/kronometer/
 IUSE=debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.14.0:5 >=kde-frameworks/kconfigwidgets-5.14.0:5 >=kde-frameworks/kcoreaddons-5.14.0:5 >=kde-frameworks/ki18n-5.14.0:5 >=kde-frameworks/kwidgetsaddons-5.14.0:5 >=kde-frameworks/kxmlgui-5.14.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kconfig-5.15.0:5 >=kde-frameworks/kconfigwidgets-5.15.0:5 >=kde-frameworks/kcoreaddons-5.15.0:5 >=kde-frameworks/ki18n-5.15.0:5 >=kde-frameworks/kwidgetsaddons-5.15.0:5 >=kde-frameworks/kxmlgui-5.15.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.0.1/src/kronometer-2.0.1.tar.xz
-_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	9d1948fed65bc0ff50d756f137681b98	kde5-functions	16af132e5e56d619e49b1a88457b2049	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	b657a2689df4f46725711250cf9c8a32	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	kde5	b7e55d19d0222bf045648cc8c3db47ee	kde5-functions	641acad8174182a50811eec70b73ccf8	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	6c01101f3b4d92c77de3e8a77cc2418b	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=0ba420f8f5244c0649d031071d1888e6
diff --git a/metadata/md5-cache/x11-misc/py3status-2.7 b/metadata/md5-cache/x11-misc/py3status-2.8
similarity index 96%
rename from metadata/md5-cache/x11-misc/py3status-2.7
rename to metadata/md5-cache/x11-misc/py3status-2.8
index 1eb20b43efc6..578242e8ecd2 100644
--- a/metadata/md5-cache/x11-misc/py3status-2.7
+++ b/metadata/md5-cache/x11-misc/py3status-2.8
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=x11-misc/i3status python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/2.7.tar.gz -> py3status-2.7.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/2.8.tar.gz -> py3status-2.8.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=65ae1eaa9432e686947c566ccc71a351
diff --git a/metadata/md5-cache/x11-misc/redshift-1.11 b/metadata/md5-cache/x11-misc/redshift-1.11
new file mode 100644
index 000000000000..8e2b2014d904
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/redshift-1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-util/intltool-0.50 nls? ( sys-devel/gettext ) appindicator? ( dev-libs/libappindicator ) 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 >=sys-apps/sed-4
+DESCRIPTION=A screen color temperature adjusting software
+EAPI=5
+HOMEPAGE=http://jonls.dk/redshift/
+IUSE=appindicator geoclue gtk nls python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) gtk? ( dev-python/pygobject[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+SLOT=0
+SRC_URI=https://github.com/jonls/redshift/archive/v1.11.tar.gz -> redshift-1.11.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome2-utils	2a93a5fe31c2295077e190059f4cf88d	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=88d4eed20e1decc786689d52aa04aaf7
diff --git a/metadata/md5-cache/x11-plugins/asmon-0.71-r1 b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
new file mode 100644
index 000000000000..06e4ede6bbc2
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-proto/xextproto
+DESCRIPTION=WindowMaker/AfterStep system monitor dockapp
+EAPI=5
+HOMEPAGE=http://rio.vg/asmon
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11
+SLOT=0
+SRC_URI=http://rio.vg/asmon/asmon-0.71.tar.bz2
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=92df586d67908769c86808948abc7cef
diff --git a/metadata/md5-cache/x11-plugins/wmcube-0.98 b/metadata/md5-cache/x11-plugins/wmcube-0.98
index 214a5afac6f1..56db2bc633e5 100644
--- a/metadata/md5-cache/x11-plugins/wmcube-0.98
+++ b/metadata/md5-cache/x11-plugins/wmcube-0.98
@@ -8,4 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://kling.mine.nu/kling/files/wmcube-0.98.tar.gz
-_md5_=42c4fb2eb9029037dcb69cd01bb3def3
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=700d10f454ee71c404160938edf2f28c
diff --git a/metadata/md5-cache/x11-plugins/wmgtemp-1.0-r1 b/metadata/md5-cache/x11-plugins/wmgtemp-1.0-r1
new file mode 100644
index 000000000000..303c28978256
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmgtemp-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto =sys-apps/lm_sensors-3* >=sys-apps/sed-4
+DESCRIPTION=CPU and SYS temperature dockapp
+EAPI=5
+HOMEPAGE=http://www.fluxcode.net
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.fluxcode.net/wmgtemp-1.0.tar.bz2
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=9073119f9f9204fa6e92598dc2213dfc
diff --git a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1 b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1
new file mode 100644
index 000000000000..02d8f47c4de0
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto
+DESCRIPTION=dockapp for monitoring internet connections to and from your computer
+EAPI=5
+HOMEPAGE=http://www.swanson.ukfsn.org/#wminet
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.swanson.ukfsn.org/wmdock/wminet-3.0.0.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f171decd2da542e5ba059e649931abb1
diff --git a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r2 b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r2
index 50092057aca3..2e08c61b7e48 100644
--- a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r2
+++ b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a282e5d98c545632eb1655c9f831d1c7
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=7c78d2d755690737cf1b601b6c3b057d
diff --git a/metadata/md5-cache/x11-plugins/wmmon-1.2_beta1 b/metadata/md5-cache/x11-plugins/wmmon-1.2_beta1
index 41ae65d6d2ea..d83cb4490ca0 100644
--- a/metadata/md5-cache/x11-plugins/wmmon-1.2_beta1
+++ b/metadata/md5-cache/x11-plugins/wmmon-1.2_beta1
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmmon-1.2b1.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fe40cb4fd422493599b01f93493ee993
+_md5_=c06a1f71e41723ae53d5fd5688ee4220
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
index 274a8846ee05..1b1142685744 100644
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
+++ b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=prepare
 DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt !<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 dockapp that informs events, such as incoming chat messages, by displaying icons and times
+DESCRIPTION=universal visual notification dockapp
 EAPI=5
 HOMEPAGE=http://swapspace.net/~matt/wmmsg
 KEYWORDS=amd64 ppc ~sparc x86
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-l
 SLOT=0
 SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d2a38a46d7ebb1bbf2b8190dbc12aa97
+_md5_=37779854cec9c8fc0d7c0b6ce85d7f77
diff --git a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1 b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
index 39964594948a..2e6aea2270e4 100644
--- a/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmmsg-1.0.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=prepare
 DEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 virtual/pkgconfig x11-libs/libXt !<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 dockapp that informs events, such as incoming chat messages, by displaying icons and times
+DESCRIPTION=universal visual notification dockapp
 EAPI=5
 HOMEPAGE=http://swapspace.net/~matt/wmmsg
 KEYWORDS=amd64 ~ppc ~sparc x86
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-l
 SLOT=0
 SRC_URI=http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5f6e51ec40627c2df90352bfb1e3c614
+_md5_=42a47414845c58c76193a12d522ce625
diff --git a/metadata/md5-cache/x11-plugins/wmpasman-0.8.5.3 b/metadata/md5-cache/x11-plugins/wmpasman-0.8.5.3
index fd8243cb0cd0..b3b4f1ff0ecb 100644
--- a/metadata/md5-cache/x11-plugins/wmpasman-0.8.5.3
+++ b/metadata/md5-cache/x11-plugins/wmpasman-0.8.5.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=prepare
 DEPEND=>=x11-libs/gtk+-2.4.1:2 >=app-crypt/mhash-0.9.1 >=app-crypt/mcrypt-2.6.4 >=sys-apps/sed-4 virtual/pkgconfig >=x11-libs/libXpm-3.5.5
 DESCRIPTION=Password storage/retrieval in a dockapp
 EAPI=5
@@ -8,4 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.4.1:2 >=app-crypt/mhash-0.9.1 >=app-crypt/mcrypt-2.6.4
 SLOT=0
 SRC_URI=mirror://sourceforge/wmpasman/wmpasman-0.8.5.3.tar.gz
-_md5_=a298d5dd70471a71b4a80a6e26455b1e
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=90057aec5eeae6266ea5d20e96a37a70
diff --git a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2 b/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2
index 0b7b8b094bc0..115931d6308c 100644
--- a/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmpop3lb-2.4.2-r2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://lbj.free.fr/wmpop3/wmpop3lb2.4.2.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c8b8cbb7adba18c9977585cfabcda21f
+_md5_=e626a3efd5436ab912de6723d78d95f0
diff --git a/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1 b/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
index 7aeb37b6ff27..bfe3ae58faa4 100644
--- a/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.swanson.ukfsn.org/wmdock/wmtop-0.9.0.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4c8fd30eb1ecaeb3f7a8fa32fdc339b9
+_md5_=9d265aaea0477a62273aba354d9b9819
diff --git a/metadata/md5-cache/x11-plugins/wmtz-0.7 b/metadata/md5-cache/x11-plugins/wmtz-0.7
index bbab959cc99d..aee94318ba6d 100644
--- a/metadata/md5-cache/x11-plugins/wmtz-0.7
+++ b/metadata/md5-cache/x11-plugins/wmtz-0.7
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://gentoo/wmtz-0.7.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=24ad28b8545e3898940374f8b1a46938
+_md5_=2f1aa85797fb78dd2e9ebcf57c094720
diff --git a/metadata/md5-cache/x11-terms/xterm-322 b/metadata/md5-cache/x11-terms/xterm-322
new file mode 100644
index 000000000000..84ada3940efd
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-322
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=5
+HOMEPAGE=http://invisible-island.net/xterm/
+IUSE=+openpty toolbar truetype unicode Xaw3d
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
+SLOT=0
+SRC_URI=ftp://invisible-island.net/xterm/xterm-322.tgz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ff72bae6c0a35cd3fe037b2243050b09
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dc72acb81c44..19337a950512 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jan 2016 22:14:20 +0000
+Mon, 04 Jan 2016 20:14:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ef05853e811d..e518d265e50e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan  2 22:13:30 UTC 2016
+Mon Jan  4 20:13:13 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 75e79c977dc0..a4ddf758aad9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Jan 2016 22:30:01 +0000
+Mon, 04 Jan 2016 20:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5b6cf1e0909f..9336998a20ab 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1451772901 Sat 02 Jan 2016 10:15:01 PM UTC
+1451938504 Mon 04 Jan 2016 08:15:04 PM UTC
diff --git a/net-im/gajim/gajim-0.16.5.ebuild b/net-im/gajim/gajim-0.16.5.ebuild
index 4819a062bc9f..84a105d909b5 100644
--- a/net-im/gajim/gajim-0.16.5.ebuild
+++ b/net-im/gajim/gajim-0.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 4f9c38f7fb6e..789e0316ec9a 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,3 +1,3 @@
-DIST pidgin-2.10.10.tar.bz2 9409485 SHA256 dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d SHA512 79c6e0b382b24b1f9208337afaf5a11de8701b7e4b84be94696df8f7d36d8126eba935144e9b764c50d98a2cc9cdcd7d26891f9d9f93924a8a7065b0540c5d37 WHIRLPOOL 5351bf6cadb3215c246dbabdc75e5f400600516bfa3864a48b647d280ba2736fb29c86717da229ff2a5fe12e57e9154ca60a3be4edda94481cdc98b0c3ec0647
 DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
+DIST pidgin-2.10.12.tar.bz2 9837598 SHA256 2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd SHA512 4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03 WHIRLPOOL 52f16cdd76b1aa3e76a877136070e3c4875827df621757d35656eb79e7d9921635f9373d33f9bc87275200e91c25a2763b4a64d90953322fd82d03860ce6a0da
 DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
diff --git a/net-im/pidgin/pidgin-2.10.10.ebuild b/net-im/pidgin/pidgin-2.10.12.ebuild
similarity index 90%
rename from net-im/pidgin/pidgin-2.10.10.ebuild
rename to net-im/pidgin/pidgin-2.10.12.ebuild
index f1461a19cc98..7d3cf1de852e 100644
--- a/net-im/pidgin/pidgin-2.10.10.ebuild
+++ b/net-im/pidgin/pidgin-2.10.12.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
 inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
 	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
@@ -30,7 +32,7 @@ IUSE+=" aqua"
 RDEPEND="
 	>=dev-libs/glib-2.16
 	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
+	ncurses? ( sys-libs/ncurses:0=[unicode]
 		dbus? ( ${PYTHON_DEPS} )
 		python? ( ${PYTHON_DEPS} ) )
 	gtk? (
@@ -40,11 +42,9 @@ RDEPEND="
 		spell? ( >=app-text/gtkspell-2.0.2:2 )
 		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
 		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		net-libs/farstream:0.1
-		media-plugins/gst-plugins-meta:0.10
-		media-plugins/gst-plugins-gconf:0.10 )
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2 )
 	zeroconf? ( net-dns/avahi[dbus] )
 	dbus? ( >=dev-libs/dbus-glib-0.71
 		>=sys-apps/dbus-0.90
@@ -53,7 +53,10 @@ RDEPEND="
 	gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
 		>=net-libs/libgadu-1.11.0[-ssl] ) )
 	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.15.4 )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-1.0.1 )
 	tcl? ( dev-lang/tcl:0= )
@@ -137,10 +140,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${WORKDIR}/${PN}-eds-3.6.patch" \
-		"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch" \
-		"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+	epatch \
+		"${FILESDIR}"/${PN}-2.10.0-gold.patch \
+		"${WORKDIR}"/${PN}-eds-3.6.patch \
+		"${FILESDIR}"/${PN}-2.10.9-fix-gtkmedia.patch \
+		"${FILESDIR}"/${PN}-2.10.10-eds-3.6-configure.ac.patch \
+		"${FILESDIR}"/${PN}-2.10.11-tinfo.patch
 	epatch_user
 
 	eautoreconf
@@ -199,6 +204,7 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \
 		$(use_enable gstreamer) \
+		$(use_with gstreamer gstreamer 1.0) \
 		$(use_enable gstreamer farstream) \
 		$(use_enable gstreamer vv) \
 		$(use_enable sasl cyrus-sasl ) \
diff --git a/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild b/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild
index d61b63ec4cb8..58d355850ed9 100644
--- a/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild
@@ -30,7 +30,7 @@ else
 fi
 
 LICENSE="kvirc"
-SLOT="4"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python spell +ssl theora +transparency webkit"
 
@@ -102,7 +102,6 @@ src_configure() {
 		-DLIB_SUFFIX=${libdir#lib}
 		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
 		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_COEXISTENCE=1
 		-DWANT_CRYPT=1
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
diff --git a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
index fd52aec9b81d..4f0be7cfe45a 100644
--- a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kvirc.net/"
 SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
 
 LICENSE="kvirc"
-SLOT="4"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +ssl theora +transparency webkit"
 
@@ -67,7 +67,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DLIB_SUFFIX=${libdir#lib}
 		-DMANUAL_REVISION=${VERSIO_PRAESENS}
-		-DWANT_COEXISTENCE=1
 		-DWANT_CRYPT=1
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index abb0dd36cd28..f7bab3d3cf61 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -30,7 +30,7 @@ else
 fi
 
 LICENSE="kvirc"
-SLOT="4"
+SLOT="0"
 KEYWORDS=""
 IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python spell +ssl theora +transparency webkit"
 
@@ -102,7 +102,6 @@ src_configure() {
 		-DLIB_SUFFIX=${libdir#lib}
 		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
 		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_COEXISTENCE=1
 		-DWANT_CRYPT=1
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
index ff7aaaa1a2d7..83588c5fb1ed 100644
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ b/net-libs/enet/enet-1.3.13.ebuild
@@ -3,8 +3,7 @@
 # $Id$
 
 EAPI=5
-
-inherit base
+inherit eutils
 
 DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
 HOMEPAGE="http://enet.bespin.org/"
@@ -17,17 +16,11 @@ IUSE="static-libs"
 
 RDEPEND="!${CATEGORY}/${PN}:0"
 
-DOCS=( "ChangeLog" "README" )
-
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
-	base_src_install
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + || die
-	fi
+	default
+	prune_libtool_files
 }
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 92bd7aac8912..34292d68f166 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1,3 @@
 DIST Electrum-2.1.1.tar.gz 1778994 SHA256 958c7113072aa4a00a7e58a6e325d952fc35896a8678952cf6487636f74164e0 SHA512 06277a810a6533cc800c6813f874a0a6e3a7e598bdd47b73a6edb440bc5efefc56edacc44c15349e3d0c72d350700c67025f43e5478b4ae838af57acc1c91f52 WHIRLPOOL 2bf9392ebbd6e7b63e4e1e12cf72356dae1e1605a3c543c3a174229247fbb280412df5fac37a195b815018b8425d88618be54d4f3b58e37273ba40776f6b3765
 DIST Electrum-2.3.3.tar.gz 1971994 SHA256 72bac30a4d82c8fbc453fab2d1fa391af690884e1727088aa969d25891a9fc0d SHA512 26c2d3eaece738a67546168d82a89c7bd5c71a146c678d186514626027d6edac4e985f08e5d6ce34217b91cefa88be0174f5f45e8caba5da4c50911780e37f1b WHIRLPOOL e10bf9d10c64e1950dd2bb48ce1fca2950acdeefd99483825751acbbf29806494cbb629ac1d51f24978a8a6a2df2ce73de2910380f8e26e4a0884bcc1f116406
-DIST Electrum-2.5.1.tar.gz 2119809 SHA256 550d26da2a5d48c260614f87447f851ef82aff301140207d349c07eea2705872 SHA512 90ef7cbe33dda1a46f9413ec51c0453c13c6355f15bf94f3562baafc391a816722500b8a6e18c9d564cacfb7d315a9e1191791612a7489baeed22781a01a9a74 WHIRLPOOL 3fafa7756ca45c3d198dbd4c6fc71c7e7c92e27b748a9fc927b7ee6ec1ce78e3c33ed8984c4baa8c951eb6eb51f55f0148610b2dc01bc90aadc93b93e08d10bd
+DIST Electrum-2.5.4.tar.gz 2114549 SHA256 c0b00f440884fe3f087e842c44914e1c5f1139d0288ecb74ba6e1ff0b2504aa3 SHA512 52ee11aa2265fea5b6302fb85724d27e47c049f81743854aeb7c2fe517f2b68628b67e1b44f543e64671b4b40731c532d45097f1d25954a6876bc3ee43cdb847 WHIRLPOOL 7322ca5c54ca99c42e2df118e5e792e3f0fee1359d0445a430ffa016b1edb890b81664f11b9532fe403c0c057212afc0057e3af455aff79b8e40f23aa11605ad
diff --git a/net-misc/electrum/electrum-2.1.1.ebuild b/net-misc/electrum/electrum-2.1.1.ebuild
index 6307463abbea..561445de2d7f 100644
--- a/net-misc/electrum/electrum-2.1.1.ebuild
+++ b/net-misc/electrum/electrum-2.1.1.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$
 
@@ -12,7 +12,7 @@ inherit eutils distutils-r1 gnome2-utils
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
 HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${MY_P}.tar.gz"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/electrum/electrum-2.3.3.ebuild b/net-misc/electrum/electrum-2.3.3.ebuild
index 64d73284704d..c0ee9615d613 100644
--- a/net-misc/electrum/electrum-2.3.3.ebuild
+++ b/net-misc/electrum/electrum-2.3.3.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$
 
@@ -12,7 +12,7 @@ inherit eutils distutils-r1 gnome2-utils
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
 HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${MY_P}.tar.gz"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/electrum/electrum-2.5.1.ebuild b/net-misc/electrum/electrum-2.5.4.ebuild
similarity index 96%
rename from net-misc/electrum/electrum-2.5.1.ebuild
rename to net-misc/electrum/electrum-2.5.4.ebuild
index 3de216065624..b2d5bb145e6c 100644
--- a/net-misc/electrum/electrum-2.5.1.ebuild
+++ b/net-misc/electrum/electrum-2.5.4.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$
 
@@ -12,7 +12,7 @@ inherit eutils distutils-r1 gnome2-utils
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
 HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${MY_P}.tar.gz"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -128,7 +128,7 @@ src_prepare() {
 		$(usex trustedcoin_com '' trustedcoin   )  \
 		$(usex vkb           '' virtualkeyboard )  \
 	; do
-		rm plugins/"${plugin}"* || die
+		rm -r plugins/"${plugin}"* || die
 	done
 
 	distutils-r1_src_prepare
diff --git a/net-misc/icaclient/icaclient-13.2.0.322243.ebuild b/net-misc/icaclient/icaclient-13.2.0.322243.ebuild
index 1d48d2a0700a..25e189584dbf 100644
--- a/net-misc/icaclient/icaclient-13.2.0.322243.ebuild
+++ b/net-misc/icaclient/icaclient-13.2.0.322243.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$
 
@@ -32,8 +32,8 @@ RDEPEND="dev-libs/atk
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
 	media-libs/libcanberra[gtk]
 	media-libs/libogg
 	media-libs/libpng:1.2
diff --git a/net-misc/icaclient/icaclient-13.2.1.328635.ebuild b/net-misc/icaclient/icaclient-13.2.1.328635.ebuild
index ed5a5aea95ac..39d40e2950c1 100644
--- a/net-misc/icaclient/icaclient-13.2.1.328635.ebuild
+++ b/net-misc/icaclient/icaclient-13.2.1.328635.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$
 
@@ -32,8 +32,8 @@ RDEPEND="dev-libs/atk
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
 	media-libs/libcanberra[gtk]
 	media-libs/libogg
 	media-libs/libpng:1.2
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index 0c5b96593f61..316fe307ee26 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1 +1,2 @@
+DIST ntpclient-2015.365.tar.gz 31023 SHA256 95c3646919a9a2278fa384aa8e37117b250577ff8b09b8c93ba53e04e729b54b SHA512 ca3d7b8ac6cb0626ac1017e4baee2faa833aab4fb449881e890b686f785b2fe30ded77a0a831f40126ded71abae0f2a944227d530859222eabfffe03f89d8a80 WHIRLPOOL da96a96d9af031cfc62594d94192416be01d2bdfc96b26e9bb71dbd9ab1a89a78183e5bd8c22791eac75006375542892807fb44ff6f2c9c6602a1171e1dc4590
 DIST ntpclient_2010_365.tar.gz 30423 SHA256 9ad9b028385082fb804167f464e2db0a0b3d33780acd399327e64898b8fcfddd SHA512 74fd5e80dcf36c4e7aca6d97c5979b0dc4c51fed592279adfd04c0d329c117bfed819ee40d6400436c0d066f73ed3403e9fba8cb05846df55c991422ce434132 WHIRLPOOL 0eb27687cb9f90317e126be3830a9c812af216dd4be60a9d11bfcfcbf4fb16572de1bbbcf0207b47290e452172126bd2be38ab7ee49e097890bdcea6a63b259b
diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/ntpclient/metadata.xml
index a40624fba8f0..9b789bab0b42 100644
--- a/net-misc/ntpclient/metadata.xml
+++ b/net-misc/ntpclient/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+	<email>monsieurp@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/ntpclient/ntpclient-2015.365.ebuild b/net-misc/ntpclient/ntpclient-2015.365.ebuild
new file mode 100644
index 000000000000..b2124eb105d0
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2015.365.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE="http://doolittle.icarus.com/ntpclient/"
+SRC_URI="http://doolittle.icarus.com/${PN}/${PN}_${PV/./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/${PN}* ${P} || die
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/-O2//;s/LDFLAGS +=/LDLIBS +=/' Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README HOWTO rate.awk rate2.awk
+}
diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild b/net-misc/ocsync/ocsync-0.90.4.ebuild
index 83e7bf194ee3..a2383be49498 100644
--- a/net-misc/ocsync/ocsync-0.90.4.ebuild
+++ b/net-misc/ocsync/ocsync-0.90.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$
 
@@ -36,6 +36,9 @@ DEPEND="${DEPEND}
 src_prepare() {
 	cmake-utils_src_prepare
 
+	sed -e "s/__FUNCTION__/__func__/" -i \
+		src/csync_log.h src/httpbf/src/httpbf.c \
+		tests/csync_tests/check_csync_log.c || die
 	# proper docdir
 	sed -e "s:/doc/ocsync:/doc/${PF}:" \
 		-i doc/CMakeLists.txt || die
diff --git a/net-misc/strongswan/strongswan-5.3.4-r1.ebuild b/net-misc/strongswan/strongswan-5.3.4-r1.ebuild
index f5d7dde9a248..cba090129ab5 100644
--- a/net-misc/strongswan/strongswan-5.3.4-r1.ebuild
+++ b/net-misc/strongswan/strongswan-5.3.4-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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
 STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
@@ -25,12 +25,12 @@ for mod in $STRONGSWAN_PLUGINS_OPT; do
 done
 
 COMMON_DEPEND="!net-misc/openswan
-	gmp? ( >=dev-libs/gmp-4.1.5 )
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
 	gcrypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
 	mysql? ( virtual/mysql )
 	sqlite? ( >=dev-db/sqlite-3.3.1 )
 	networkmanager? ( net-misc/networkmanager )
@@ -42,7 +42,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2
-	!net-misc/libreswan"
+	!net-misc/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
 
 UGID="ipsec"
 
diff --git a/net-misc/strongswan/strongswan-5.3.4.ebuild b/net-misc/strongswan/strongswan-5.3.4.ebuild
index 2b2527786805..b82e6affc8b1 100644
--- a/net-misc/strongswan/strongswan-5.3.4.ebuild
+++ b/net-misc/strongswan/strongswan-5.3.4.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$
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ~ppc64 x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
 STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
@@ -25,12 +25,12 @@ for mod in $STRONGSWAN_PLUGINS_OPT; do
 done
 
 COMMON_DEPEND="!net-misc/openswan
-	gmp? ( >=dev-libs/gmp-4.1.5 )
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
 	gcrypt? ( dev-libs/libgcrypt:0 )
 	caps? ( sys-libs/libcap )
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
 	mysql? ( virtual/mysql )
 	sqlite? ( >=dev-db/sqlite-3.3.1 )
 	networkmanager? ( net-misc/networkmanager )
@@ -42,7 +42,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2
-	!net-misc/libreswan"
+	!net-misc/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
 
 UGID="ipsec"
 
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 62417ad97b1c..e9f3b6de3901 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,3 +1,2 @@
 DIST vde2-2.2.2.tar.bz2 472059 SHA256 7d4b68c1ba1b661db05ff3674abff4d2ad5da31bb3471699bbec3f2f360b483a SHA512 47dab6f266fa9bb9e581fc3339719d7ee26b2b293ebdd9dca500d1c08e05fe90299fb2962ca4e6efc8528f1291ec0eb3f429cf3a4bbfb1cd0539d68fa39aeab0 WHIRLPOOL fa2ff0d8d2b2fab6c76e84fe1c63fe32c649dc972cc4735d5d4f0b4fa2b0dba4cce6a3101fabdace1c05f441c4ec679554b1d9e078540910bd9fa559fed5e0a9
-DIST vde2-2.3.1.tar.bz2 510947 SHA256 0baa6d429e022eb4069252c0f58636c4b5e0dd2e3a495bdb14b32ecc363d147f SHA512 0484b8e09039263f3050acc4985b6250f025c12bb03c2a4e4f5a78252d8c220e4297e8bafff93949b1c6807982847fc81200b9ba4bb54abaa05cbfe67efcdbe1 WHIRLPOOL 46726e93531608dee3162cf32a8344b6d3ece433195d0ae15502610a2cfaf6397e2a3dd5fe19ba1fc2844e9b861620ee3710b688f4f0c84dd6246699a31b10c3
 DIST vde2-2.3.2.tar.bz2 600527 SHA256 cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 WHIRLPOOL dde513400eb725fe683c01110628ec9d2c3e415f0907d4f62d9bf09e2ec8ad14c4ad6437e428680a680118eb4297132f938b5cf71123480bf59c8f37eb0fee53
diff --git a/net-misc/vde/files/vde-2.2.2-gcc53.patch b/net-misc/vde/files/vde-2.2.2-gcc53.patch
new file mode 100644
index 000000000000..60fb98cc9a8d
--- /dev/null
+++ b/net-misc/vde/files/vde-2.2.2-gcc53.patch
@@ -0,0 +1,66 @@
+--- src/slirpvde/misc.c	2016-01-02 22:54:35.746094904 -0500
++++ src/slirpvde/misc.c.old	2016-01-02 22:54:33.152132668 -0500
+@@ -120,11 +120,15 @@ getouraddr()
+ struct quehead_32 {
+ 	u_int32_t qh_link;
+ 	u_int32_t qh_rlink;
+ };
+
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ insque_32(a, b)
+ 	void *a;
+ 	void *b;
+ {
+ 	register struct quehead_32 *element = (struct quehead_32 *) a;
+@@ -134,11 +134,15 @@ insque_32(a, b)
+ 	element->qh_rlink = (u_int32_t)head;
+ 	((struct quehead_32 *)(element->qh_link))->qh_rlink
+ 	= (u_int32_t)element;
+ }
+ 
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ remque_32(void *a)
+ {
+ 	register struct quehead_32 *element = (struct quehead_32 *) a;
+ 	((struct quehead_32 *)(element->qh_link))->qh_rlink = element->qh_rlink;
+ 	((struct quehead_32 *)(element->qh_rlink))->qh_link = element->qh_link;
+@@ -150,11 +150,15 @@ remque_32(void *a)
+ struct quehead {
+ 	struct quehead *qh_link;
+ 	struct quehead *qh_rlink;
+ };
+ 
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ insque(a, b)
+ 	void *a, *b;
+ {
+ 	register struct quehead *element = (struct quehead *) a;
+ 	register struct quehead *head = (struct quehead *) b;
+@@ -163,11 +163,15 @@ insque(a, b)
+ 	element->qh_rlink = (struct quehead *)head;
+ 	((struct quehead *)(element->qh_link))->qh_rlink
+ 	= (struct quehead *)element;
+ }
+ 
++#ifdef __GNUC_GNU_INLINE__
+ inline void
++#else
++extern inline void
++#endif
+ remque(a)
+      void *a;
+ {
+   register struct quehead *element = (struct quehead *) a;
+   ((struct quehead *)(element->qh_link))->qh_rlink = element->qh_rlink;
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index 8ea7011f3c7d..ac0f4c2e6718 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>nvinson234@gmail.com</email>
+    <name>Nicholas Vinson</name>
+    <description>Proxy maintainer to be assigned bugs</description>
+  </maintainer>
   <maintainer>
     <email>mlspamcb@noci.xs4all.nl</email>
   </maintainer>
diff --git a/net-misc/vde/vde-2.3.2-r1.ebuild b/net-misc/vde/vde-2.2.2-r1.ebuild
similarity index 57%
rename from net-misc/vde/vde-2.3.2-r1.ebuild
rename to net-misc/vde/vde-2.2.2-r1.ebuild
index fa698020c4e2..242951dbed74 100644
--- a/net-misc/vde/vde-2.3.2-r1.ebuild
+++ b/net-misc/vde/vde-2.2.2-r1.ebuild
@@ -1,66 +1,53 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 user
+inherit eutils flag-o-matic user
 
 MY_P="${PN}2-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
 SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
 HOMEPAGE="http://vde.sourceforge.net/"
-
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="pcap python ssl static-libs"
-
-RDEPEND="pcap? ( net-libs/libpcap )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# default group already used in kqemu
-	enewgroup qemu
-
-	python-single-r1_pkg_setup
-}
+# The slirpvde-buffer-overflow patch was made by Ludwig Nussel and submitted upstream at
+# http://sourceforge.net/tracker/?func=detail&aid=2138410&group_id=95403&atid=611248
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-slirpvde-buffer-overflow.patch"
+	"${FILESDIR}/${P}-gcc53.patch"
+)
 
 src_prepare() {
+	epatch "${PATCHES[@]}"
 	epatch_user
 }
 
 src_configure() {
-	econf \
-		$(use_enable pcap) \
-		$(use_enable python) \
-		$(use_enable ssl cryptcab) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1
+	append-cflags $(test-flags-CC -fno-strict-aliasing)
+	econf
 }
 
 src_install() {
-	default
-	prune_libtool_files
-
+	emake DESTDIR="${D}" install || die "emake install failed"
 	newinitd "${FILESDIR}"/vde.init vde
 	newconfd "${FILESDIR}"/vde.conf vde
+
+	dodoc INSTALL README
 }
 
 pkg_postinst() {
+	# default group already used in kqemu
+	enewgroup qemu
 	einfo "To start vde automatically add it to the default runlevel:"
 	einfo "# rc-update add vde default"
 	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+	einfo "To use it as a user be sure to set a group in /etc/conf.d/vde"
 	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
 }
diff --git a/net-misc/vde/vde-2.3.1.ebuild b/net-misc/vde/vde-2.3.1.ebuild
deleted file mode 100644
index 8a5d528eb7f6..000000000000
--- a/net-misc/vde/vde-2.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils user
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="pcap ssl static-libs"
-
-RDEPEND="pcap? ( net-libs/libpcap )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable pcap) \
-		$(use_enable ssl cryptcab) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	newinitd "${FILESDIR}"/vde.init vde
-	newconfd "${FILESDIR}"/vde.conf vde
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as a user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/vde/vde-2.3.2.ebuild b/net-misc/vde/vde-2.3.2.ebuild
deleted file mode 100644
index 88f423771a51..000000000000
--- a/net-misc/vde/vde-2.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python user
-
-MY_P="${PN}2-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="pcap python ssl static-libs"
-
-RDEPEND="pcap? ( net-libs/libpcap )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable pcap) \
-		$(use_enable python) \
-		$(use_enable ssl cryptcab) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	newinitd "${FILESDIR}"/vde.init vde
-	newconfd "${FILESDIR}"/vde.conf vde
-}
-
-pkg_postinst() {
-	# default group already used in kqemu
-	enewgroup qemu
-
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-	einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild b/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
index 5db7401e49ee..5b256a818a4b 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
 DEPEND="
diff --git a/net-nds/nsscache/files/authorized-keys-command.py b/net-nds/nsscache/files/authorized-keys-command.py
new file mode 100644
index 000000000000..085be71d67c1
--- /dev/null
+++ b/net-nds/nsscache/files/authorized-keys-command.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# vim: ts=4 sts=4 et:
+# pylint: disable=invalid-name
+"""
+OpenSSH AuthorizedKeysCommand: NSSCache input
+Copyright 2016 Gentoo Foundation
+Distributed is distributed under the BSD license.
+
+This script returns one or more authorized keys for use by SSH, by extracting
+them from a local cache file /etc/sshkey.cache.
+
+Two variants are supported, based on the existing nsscache code:
+Format 1:
+ username:key1
+ username:key2
+Format 2:
+ username:['key1', 'key2']
+
+Ensure this script is mentioned in the sshd_config like so:
+AuthorizedKeysCommand /path/to/nsscache/authorized-keys-command.py
+"""
+from __future__ import print_function
+from ast import literal_eval
+from os.path import basename
+import sys
+import errno
+
+SSHKEY_CACHE = '/etc/sshkey.cache'
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        sys.exit("Usage: %s %s" % (basename(sys.argv[0]), 'USERNAME'))
+
+    try:
+        with open(SSHKEY_CACHE, 'r') as f:
+            for line in f:
+                (username, key) = line.split(':', 1)
+                if username != sys.argv[1]:
+                    continue
+                key = key.strip()
+                if key.startswith("[") and key.endswith("]"):
+                    # Python array
+                    for i in literal_eval(key):
+                        print(i.strip())
+                else:
+                    # Raw key
+                    print(key)
+    except IOError as err:
+        if err.errno in [errno.EPERM, errno.ENOENT]:
+            pass
+        else:
+            raise err
diff --git a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
new file mode 100644
index 000000000000..59adde1eac0d
--- /dev/null
+++ b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch
@@ -0,0 +1,41 @@
+From cc0f2d7485205d6f9b8c434cb0da292e12448216 Mon Sep 17 00:00:00 2001
+From: Thomas Glanzmann <thomas@glanzmann.de>
+Date: Wed, 2 Sep 2015 17:01:40 +0200
+Subject: [PATCH] Provider parameter when calling SshkeyUpdateGetter in order
+ to fix sshkey
+
+Without this change retrieving the map sshkey results in the following exception:
+
+(localhost) [~/work/nsscache] nsscache update
+Traceback (most recent call last):
+  File "/usr/bin/nsscache", line 33, in <module>
+    return_value = nsscache_app.Run(sys.argv[1:], os.environ)
+  File "/usr/lib/python2.6/site-packages/nss_cache/app.py", line 240, in Run
+    retval = command_callable().Run(conf=conf, args=args)
+  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 230, in Run
+    force_lock=options.force_lock)
+  File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 303, in UpdateMaps
+    force_write=force_write)
+  File "/usr/lib/python2.6/site-packages/nss_cache/update/updater.py", line 265, in UpdateFromSource
+    force_write, location=None)
+  File "/usr/lib/python2.6/site-packages/nss_cache/update/map_updater.py", line 75, in UpdateCacheFromSource
+    location=location)
+  File "/usr/lib/python2.6/site-packages/nss_cache/sources/source.py", line 65, in GetMap
+    return self.GetSshkeyMap(since)
+  File "/usr/lib/python2.6/site-packages/nss_cache/sources/ldapsource.py", line 274, in GetSshkeyMap
+    return SshkeyUpdateGetter().GetUpdates(source=self,
+TypeError: __init__() takes exactly 2 arguments (1 given)
+
+diff --git a/nss_cache/sources/ldapsource.py b/nss_cache/sources/ldapsource.py
+index 2af170e..5ffea81 100644
+--- a/nss_cache/sources/ldapsource.py
++++ b/nss_cache/sources/ldapsource.py
+@@ -271,7 +271,7 @@ class LdapSource(source.Source):
+     Returns:
+       instance of maps.SshkeyMap
+     """
+-    return SshkeyUpdateGetter().GetUpdates(source=self,
++    return SshkeyUpdateGetter(self.conf).GetUpdates(source=self,
+                                            search_base=self.conf['base'],
+                                            search_filter=self.conf['filter'],
+                                            search_scope=self.conf['scope'],
diff --git a/net-nds/nsscache/nsscache-0.30-r1.ebuild b/net-nds/nsscache/nsscache-0.30-r1.ebuild
new file mode 100644
index 000000000000..5be043c32bae
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.30-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="commandline tool to sync directory services to local cache"
+HOMEPAGE="https://github.com/google/nsscache"
+SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="nssdb nsscache"
+
+DEPEND="${PYTHON_DEPS}
+		dev-python/python-ldap[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/bsddb3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+		nssdb? ( sys-libs/nss-db )
+		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
+RESTRICT="test"
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+	find "${S}" -name '*.py' -exec \
+		sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \
+		{} \+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman nsscache.1 nsscache.conf.5
+	dodoc THANKS nsscache.cron CONTRIBUTING.md README.md
+	exeinto /usr/libexec/nsscache
+	doexe "${FILESDIR}"/authorized-keys-command.py
+
+	keepdir /var/lib/nsscache
+}
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index ea80bdfeb96b..fd534fdd957e 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,4 +1,5 @@
 DIST liferea-1.10.12.tar.bz2 1458081 SHA256 511bd217cbef28293eab3fb00c1dd070482fdc0bdeb237256b4ab8c746360430 SHA512 1f3be81782558d6fb3cc79f54b39acfd46c020be2de9b7efca58578c55cc95b490d6a079e0e1d2506f3bf37b6ab7522f5beca8be83f18bdb1e4817c68ca61e11 WHIRLPOOL 598c3c6f4541c434bc488ed3fd24860a0128cdf919aa736a58bd72092ddf6c420fc2aa7686a39535cb9fc588c0ea956a1d0f91377ffe30e8470bcd9920705c8d
+DIST liferea-1.10.16.tar.bz2 1444638 SHA256 32b9a2a57b3d0063c696359de8b9adb6bf31eb8040ffce24878455153ddd0c2d SHA512 dd38920adbe4666c8671eba08689f117e82ed4508b5606e471261d7f980b0e4290b510f1b55cd87b457ee1682f054430b5c8a3b220b5e1da188e0dab52b2c878 WHIRLPOOL 7903b5cd0ac533f9b7bdd1f2e949b10b3a95ff1e8faccfcb5cd11f8396d05e9502ab906e6f34e46d03bd833f2a5a1688e7ec77be9ef535966afd8526698d42e2
 DIST liferea-1.10.17.tar.bz2 1446634 SHA256 dd77d9a4a7203e948977bf03359918cca0c600d582545d6c1851c1c141a16f6b SHA512 8776952793a3c323a387d17ac401bd7453d29169efcc55e0096fb3b6b8b19958f29d00bfb02e83d7362602ac1ea03a03956f6d5117868054c3b76d3ba35d0a15 WHIRLPOOL 0087fcd188f37a5548aa0b3b0513f0d54aea0a8d25a1157969c33af68521e6b0facf12b3e59288006741704c1dcdf7528ef1ec67b4e14b667066c6a137b0e471
 DIST liferea-1.10.8.tar.bz2 1430531 SHA256 9dd7cb09f624c2f2765aadb139278f635032c9edd05d20a2b2405690546571b4 SHA512 bd77b8f7ae13de3dacad2f5b40db690c8172ccb8ccc698be036ea82ebdd3902015764b7f3f21ced50bc4f49bfb5d88df008be498701bd7433246dc000aad3964 WHIRLPOOL f6bb77a20998cef281d97013187dfb3594a76d4ba1f293c855a31caadd26f46ea5d3173770503b1babeca6cb7e5846b05a06dae2533ecb215d240100729d60e5
 DIST liferea-1.10.9.tar.bz2 1432972 SHA256 5181c75a05353996d912075a02912017e07589b6a9121bb280bf37dec178d968 SHA512 cd857b7edd6cdf041726aaf54c8d208f161409d92ff540e37331a8edb76fcd05b3b138b14f84b0c8cb06ce8f23bf849d4333cf3e42a2eccc768b10e72d7821d8 WHIRLPOOL fc14d1c58a2870543ba6935b3981896f493ccec3e13ab6ac4522e6f7404f630c19d91151c7e1444010b52f2fffb8eee35ec45344e6ffd07f1b80e6bce28d3f50
diff --git a/net-news/liferea/liferea-1.10.16.ebuild b/net-news/liferea/liferea-1.10.16.ebuild
new file mode 100644
index 000000000000..b917adc69917
--- /dev/null
+++ b/net-news/liferea/liferea-1.10.16.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 pax-utils
+
+MY_P=${P/_/-}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="ayatana libnotify"
+
+RDEPEND="x11-libs/gtk+:3
+	>=dev-libs/glib-2.26.0:2
+	dev-libs/json-glib
+	>=dev-libs/libpeas-1.0.0[gtk]
+	>=net-libs/libsoup-2.28.2:2.4
+	dev-libs/libunique:3
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	>=dev-db/sqlite-3.7.0:3
+	>=gnome-base/gconf-1.1.9:2
+	gnome-base/gsettings-desktop-schemas
+	>=net-libs/webkit-gtk-1.6.1:3
+	>=x11-libs/pango-1.4.0
+	ayatana? ( dev-libs/libindicate )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		$(use_enable ayatana libindicate)
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	# bug #338213
+	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
+	# MPROTECT policy violation. Will sit here until webkit will
+	# get optional JIT.
+	pax-mark m "${D}"/usr/bin/liferea
+
+	einfo "If you want to enhance the functionality of this package,"
+	einfo "you should consider installing:"
+	einfo "    dev-libs/dbus-glib"
+	einfo "    net-misc/networkmanager"
+}
diff --git a/net-p2p/litecoin-qt/files/litecoind-0.10.2.2-fix-gnustack.patch b/net-p2p/litecoin-qt/files/litecoind-0.10.2.2-fix-gnustack.patch
new file mode 100644
index 000000000000..cbaf66ea93e1
--- /dev/null
+++ b/net-p2p/litecoin-qt/files/litecoind-0.10.2.2-fix-gnustack.patch
@@ -0,0 +1,17 @@
+diff -Naur litecoin-0.10.2.2.orig/src/secp256k1/src/field_5x52_asm.asm litecoin-0.10.2.2/src/secp256k1/src/field_5x52_asm.asm
+--- litecoin-0.10.2.2.orig/src/secp256k1/src/field_5x52_asm.asm	2015-06-15 04:51:30.000000000 -0400
++++ litecoin-0.10.2.2/src/secp256k1/src/field_5x52_asm.asm	2016-01-03 08:35:26.438350565 -0500
+@@ -466,4 +466,12 @@
+ 	jmp common_exit_norm
+ 	end
+ 
+-	
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r3.ebuild
similarity index 97%
rename from net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild
rename to net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r3.ebuild
index 49c5cacd64bf..7c5c59f356f7 100644
--- a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild
+++ b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r3.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$
 
@@ -60,6 +60,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/0.9.0-sys_leveldb.patch
 	epatch "${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch
 	epatch "${FILESDIR}"/litecoin-miniupnpc-abi.patch
+	epatch "${FILESDIR}"/litecoind-0.10.2.2-fix-gnustack.patch
 	eautoreconf
 	rm -r src/leveldb
 
diff --git a/net-p2p/litecoind/files/litecoind-0.10.2.2-fix-gnustack.patch b/net-p2p/litecoind/files/litecoind-0.10.2.2-fix-gnustack.patch
new file mode 100644
index 000000000000..cbaf66ea93e1
--- /dev/null
+++ b/net-p2p/litecoind/files/litecoind-0.10.2.2-fix-gnustack.patch
@@ -0,0 +1,17 @@
+diff -Naur litecoin-0.10.2.2.orig/src/secp256k1/src/field_5x52_asm.asm litecoin-0.10.2.2/src/secp256k1/src/field_5x52_asm.asm
+--- litecoin-0.10.2.2.orig/src/secp256k1/src/field_5x52_asm.asm	2015-06-15 04:51:30.000000000 -0400
++++ litecoin-0.10.2.2/src/secp256k1/src/field_5x52_asm.asm	2016-01-03 08:35:26.438350565 -0500
+@@ -466,4 +466,12 @@
+ 	jmp common_exit_norm
+ 	end
+ 
+-	
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf32
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
++%ifidn __OUTPUT_FORMAT__,elf64
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
diff --git a/net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild b/net-p2p/litecoind/litecoind-0.10.2.2-r4.ebuild
similarity index 96%
rename from net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild
rename to net-p2p/litecoind/litecoind-0.10.2.2-r4.ebuild
index c7f70686e16c..9b2dea415f0f 100644
--- a/net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild
+++ b/net-p2p/litecoind/litecoind-0.10.2.2-r4.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$
 
@@ -46,6 +46,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/0.9.0-sys_leveldb.patch
 	epatch "${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch
 	epatch "${FILESDIR}"/litecoin-miniupnpc-abi.patch
+	epatch "${FILESDIR}"/litecoind-0.10.2.2-fix-gnustack.patch
 	eautoreconf
 	rm -r src/leveldb
 }
diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index 8e12edc12663..9b6cbf577dda 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,3 +1,2 @@
-DIST neard-0.11.tar.xz 330192 SHA256 6c802ac1f74051ea078e5aa0d1d01ee83fc2f8e5cd41444d76669a090d1b356d SHA512 485098e0eb2d3daecc9732cd134e14d874c2ace725251db1813d841e1949fac493b8dc7dde62079fd41f429eb76463733b7be8d7e4d7b441ea93c9b0161d3f05 WHIRLPOOL 811fcd1f7210798bf62b5a7a8db1607f8768707d4bfc204c855ef94b3df1d6486d20761140e2f233c37a9ba78ad1f0d7a2a48046bc9a775c6799226ff4cc6289
 DIST neard-0.13.tar.xz 342872 SHA256 f5b849b863e43b06fa6bbc5fefb6638dc426769738f43eee159c90e696ac20f5 SHA512 ae59c5b2cae553457151935273f604671e842cba6d239af6ae12be62c621240fb35bb70858d2ab87b7062ee041e21ba0af20c8bd6637cc2484b151bc56dd9982 WHIRLPOOL 713540c16bd915bcf2561e4f7b84fd43b61455cd7900583611222d5c5da11d6538eb4c090d729643823e13d6de17d97646fbebbd6664cc920a13d86e2e69197a
 DIST neard-0.15.tar.xz 368196 SHA256 651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353 SHA512 daaa001a305f0d200bb03bf614c938256fa5c07d480bf820d5e83da80d930e060b5bb6a09234f1c3f7ecbd3cb0af378a1de675dd4dcd99b728677430e0cd111d WHIRLPOOL e066ec628760275866ae0ba8d5dbea68784c00963dcc5f1dbea8352c45098b34835ce609665ded9f15b266998902069370c9c0a2947ee46cbd6220ae79c1e513
diff --git a/net-wireless/neard/neard-0.11.ebuild b/net-wireless/neard/neard-0.11.ebuild
deleted file mode 100644
index 704a5a4fb56b..000000000000
--- a/net-wireless/neard/neard-0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="Near Field Communication (NFC) management daemon"
-HOMEPAGE="https://01.org/linux-nfc/"
-SRC_URI="mirror://kernel/linux/network/nfc/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="tools"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	dev-libs/libnl
-	>=sys-apps/dbus-1.2.24"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable tools)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-wireless/reaver/reaver-1.4-r1.ebuild b/net-wireless/reaver/reaver-1.4-r1.ebuild
deleted file mode 100644
index 8ae5152dfa7f..000000000000
--- a/net-wireless/reaver/reaver-1.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit autotools-utils
-
-DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://code.google.com/p/reaver-wps/"
-SRC_URI="https://reaver-wps.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-		dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=( "${FILESDIR}/${P}_var_db.patch" )
-
-src_install() {
-	dobin wash reaver
-
-	insinto "/var/db/reaver"
-	doins reaver.db
-
-	doman ../docs/reaver.1.gz
-	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
-}
diff --git a/net-wireless/reaver/reaver-1.4.ebuild b/net-wireless/reaver/reaver-1.4.ebuild
deleted file mode 100644
index a28ac63868de..000000000000
--- a/net-wireless/reaver/reaver-1.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit autotools-utils
-
-DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://code.google.com/p/reaver-wps/"
-SRC_URI="https://reaver-wps.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-		dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_install() {
-	dobin wash reaver
-
-	insinto "/etc/reaver"
-	doins reaver.db
-
-	doman ../docs/reaver.1.gz
-	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
-}
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 101c6449bbbd..5d211b89215a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -45,10 +45,6 @@ gnome-base/gnome classic
 # Missing keywords from dev-ml/lablgtk, bug #487722
 net-p2p/mldonkey gtk guionly
 
-# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
-# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
->=media-video/mpv-0.2.0 luajit
-
 # Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
 # Missing keywords, bug #484734
 media-sound/rhythmbox visualizer
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index 52b58675373c..0a2ebed5e60d 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -37,10 +37,6 @@ gnome-base/gnome classic
 # Missing keywords from dev-ml/lablgtk, bug #487722
 net-p2p/mldonkey gtk guionly
 
-# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
-# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
->=media-video/mpv-0.2.0 luajit
-
 # Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
 # Missing keywords, bug #484734
 media-sound/rhythmbox visualizer
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e7c2d9d2f47e..baaa3dc8e66b 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -5,6 +5,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Ian Delaney <idella4@gentoo.org> (04 Jan 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# media-libs/libcaca wasn't stabilized in the past, but now
+# it's ready for the next stable mpv release after the one below.
+=media-video/mpv-0.9.2-r1 libcaca
+
 # Mike Gilbert <floppym@gentoo.org> (02 Dec 2015)
 # Needs unstable ffmpeg.
 =www-client/chromium-47* system-ffmpeg
@@ -84,10 +90,6 @@ media-libs/libcaca java mono
 # dev-libs/opencryptoki will not be stabile any time soon (bug#510204)
 app-crypt/tpm-tools pkcs11
 
-# Mikle Kolyada <zlogene@gentoo.org>
-# Not yet stabilized dependency (bug #514906)
-media-video/mpv libcaca
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (29 Jun 2014)
 # Not yet stabilized dependencies blocking sec bug 514886
 app-office/libreoffice firebird
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index bca656e4e688..fa149da00d5b 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -7,6 +7,7 @@ sys-devel/autoconf
 sys-devel/automake
 sys-kernel/linux-headers
 sys-libs/glibc
+sys-libs/musl
 sys-libs/uclibc
 sys-freebsd/freebsd-lib
 sys-devel/binutils
diff --git a/profiles/package.mask b/profiles/package.mask
index 8fdd4c753080..ebab05beb4ad 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,40 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrey Grozin <grozin@gentoo.org> (04 Jan 2016)
+# Needs a bump and substantial ebuild rewrite
+=sci-mathematics/reduce-20110414-r1
+
+# Michael Sterrett <mr_bones_@gentoo.org> (04 Jan 2016)
+# Upstream stopped development in 2004 and doesn't work on modern systems.
+# Masked for removal on 20160203
+games-puzzle/krystaldrop
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Fails to build, bug #368873. Removal in a month
+x11-misc/xoo
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Fails to build, bug #368913. Removal in a month
+media-video/cxfe
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Fails to build, bug #369053. Removal in a month
+media-sound/freewheeling
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Fails to build, bug #369769. Removal in a month
+media-sound/gqmpeg
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Fails to build, bug #370581. Removal in a month
+media-sound/freebirth
+
+# Pacho Ramos <pacho@gentoo.org> (03 Jan 2016)
+# Obsolete lib, nothing needs it, bug #380193
+# Removal in a month
+x11-libs/libsexy
+
 # Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
 # Nothing requires this obsolete versions, bug #249418
 # Removal in a month.
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 275de332c31f..93d5e35b1dfa 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -67,6 +67,7 @@ dev-db/sqlitebrowser -qt4
 >=dev-games/openscenegraph-3.2.1-r1 -qt4
 >=dev-libs/qcustomplot-1.3.0 -qt4
 >=dev-libs/quazip-0.7.1 -qt4
+dev-util/cmake -qt4
 >=kde-misc/kdiff3-0.9.98-r1 -kde -qt4
 >=media-libs/mlt-0.9.8-r1 -kde -qt4
 >=media-libs/opencv-3.0.0 -qt4
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 08322587fbbd..51c43290872c 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -8,7 +8,7 @@ fedora-dev	http://mirror.aarnet.edu.au/pub/fedora/linux http://mirror.internode.
 flightgear	ftp://ftp.de.flightgear.org/pub/fgfs http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp ftp://ftp.kingmont.com/flightsims/flightgear ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org
 freebsd		ftp://ftp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ar.FreeBSD.org/pub/FreeBSD/ ftp://ftp.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.au.FreeBSD.org/pub/FreeBSD/ ftp://ftp.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.at.FreeBSD.org/pub/FreeBSD/ ftp://ftp.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.br.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ca.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ca.FreeBSD.org/ ftp://ftp.cn.FreeBSD.org/pub/FreeBSD/ ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/ ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.dk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ee.FreeBSD.org/pub/FreeBSD/ ftp://ftp.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.fr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.de.FreeBSD.org/pub/FreeBSD/ ftp://ftp.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.gr.FreeBSD.org/pub/FreeBSD/ ftp://ftp.hk.FreeBSD.org/pub/FreeBSD/ ftp://ftp.is.FreeBSD.org/pub/FreeBSD/ ftp://ftp.id.FreeBSD.org/pub/FreeBSD/ ftp://ftp.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.ie.FreeBSD.org/pub/FreeBSD/ ftp://ftp.it.FreeBSD.org/pub/FreeBSD/ ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.jp.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.kr.FreeBSD.org/pub/FreeBSD/ ftp://ftp1.us.FreeBSD.org/pub/FreeBSD/ ftp://ftp2.us.FreeBSD.org/pub/FreeBSD/
 gentoo		http://gentoo.osuosl.org/distfiles http://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles http://gentoo.ussg.indiana.edu/distfiles
-gimp		http://de-mirror.gimper.net/pub/gimp/ http://gimp.afri.cc/pub/gimp/ http://gimper.net/downloads/pub/gimp/ http://ftp.gwdg.de/pub/misc/grafik/gimp/gimp http://download.gimp.org/pub/gimp
+gimp		ftp://ftp.fau.de/gimp/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://mirrors-usa.go-parts.com/gimp/gimp/ http://gimp.afri.cc/pub/gimp/ http://gimp.mirrors.hoobly.com/pub/gimp/ http://mirror.hessmo.com/gimp/pub/gimp/ http://mirror.nbtelecom.com.br/gimp/gimp/ https://ftp.fau.de/gimp/gimp/ http://www.go-parts.com/mirrors-usa/gimp/gimp/ http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/
 github		https://github.com/downloads
 gmt		ftp://mirror.geosci.usyd.edu.au/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ibis.grdl.noaa.gov/pub/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/
 gnome		http://download.gnome.org/
@@ -36,7 +36,7 @@ quakeunity	http://www.mirrorservice.org/sites/quakeunity.com http://games.mirror
 rubyforge	http://files.rubyforge.vm.bytemark.co.uk
 rubygems	https://rubygems.org/gems
 ruby      https://cache.ruby-lang.org/pub/ruby/ http://ruby.taobao.org/mirrors/ruby/ ftp://ftp.fu-berlin.de/unix/languages/ruby/
-samba		http://ftp.samba.org/pub/samba ftp://au1.samba.org/pub/samba ftp://ca.samba.org/pub/samba ftp://de.samba.org/pub/samba ftp://fi.samba.org/pub/samba ftp://ftp.azc.uam.mx/mirrors/samba  ftp://ftp.samba.gr.jp/pub/samba ftp://gd.tuwien.ac.at/infosys/servers/samba ftp://it.samba.org/pub/samba ftp://pl.samba.org/pub/samba
+samba		http://ftp.samba.org/pub/samba ftp://ftp.samba.gr.jp/pub/samba ftp://gd.tuwien.ac.at/infosys/servers/samba https://ftp.heanet.ie/mirrors/samba http://ftp.cc.uoc.gr/mirrors/samba http://mirrors.azc.uam.mx/mirrors/samba
 sabayon         http://sabayon.c3sl.ufpr.br/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://ftp.rnl.ist.utl.pt/pub/sabayon/distfiles http://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://cross-lfs.sabayonlinux.org/distfiles http://sabayon.mirror.dkm.cz/pub/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles http://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
 slang		ftp://space.mit.edu/pub/davis/slang ftp://ftp.fu-berlin.de/pub/unix/misc/slang ftp://ftp.ntua.gr/pub/lang/slang/slang
 snobol4		ftp://ftp.snobol4.com ftp://ftp.ultimate.com/snobol
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
new file mode 100644
index 000000000000..22fd00aa3cda
--- /dev/null
+++ b/profiles/updates/1Q-2016
@@ -0,0 +1 @@
+slotmove net-irc/kvirc 4 0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6a150a7aea96..b071c9b8cc96 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -212,8 +212,6 @@ app-admin/openrc-settingsd:systemd - Use the versions of dbus and polkit files p
 app-admin/packagekit-base:command-not-found - Enable packagekit support on shell "command not found"
 app-admin/packagekit-base:cron - Install cron script for auto-update
 app-admin/packagekit-base:entropy - Enable Entropy backend
-app-admin/packagekit-base:introspection - Use dev-libs/gobject-introspection Enable introspection
-app-admin/packagekit-base:pm-utils - Add pm-utils (suspend/resume) functionalities
 app-admin/pass:X - Use x11-misc/xclip to copy passwords to the clipboard.
 app-admin/pass:dmenu - Add support for x11-misc/dmenu with the 'passmenu' program.
 app-admin/pass:fish-completion - Enable fish completion support.
@@ -1343,8 +1341,6 @@ dev-db/mariadb-galera:yassl - Enable SSL connections and crypto functions using
 dev-db/maxscale:jemalloc - Use dev-libs/jemalloc for allocations
 dev-db/maxscale:rabbitmq - Add support for RabbitMQ message queue
 dev-db/mongodb:mms-agent - Install the MongoDB Monitoring Service agent
-dev-db/mongodb:sharedclient - build client shared library libmongoclient.so
-dev-db/mongodb:spidermonkey - Use embedded SpiderMonkey engine (dev-lang/spidermonkey) instead of v8
 dev-db/mongodb:tools - Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools
 dev-db/mysql:client-libs - Build the libmysqlclient libraries
 dev-db/mysql:cluster - Add support for NDB clustering (deprecated)
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 45a928378fdf..5654025e541a 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,4 +1,3 @@
-DIST rebase-1509.tar.xz 81228428 SHA256 ffad3955197850b4383bf7b96278af357cb99bec129e7a00d7d601e76868870b SHA512 2d9f90c24ab977b29a1e1e790966f48274691375ab5f4b7a4f37c1e62dc8bd4d0b4409475e9b97bb63e3f481066f8407efc4d1314ee24c836f60b53d736d77ed WHIRLPOOL ab86576f037d142a285f3830f88e5b750a52f79c90f35bd117695a5de125c753747329522b1f514c503ff7e28e8aaaa2298bff3379f134db06fc270ec7364a52
 DIST rebase-1510.tar.xz 90412200 SHA256 0a33a34003c95f65d8ec8bbf11907bccad47d0bdddc39030a663df5ef2922f87 SHA512 c76b42df5a5bc64a951693b35a8664195a0fb1b84bdd64f80e8986a705ca1279e51c324153a83272ecb9b3dfb3fd565cb43c2b25c9e37655767c278e6320590e WHIRLPOOL 238841844c19ad028147a4a5a366a219e405b1ae1d0ae79767775518a0ecdabe37948a260724e4053af183ad00799c60da21d57dae84cdc6859e19a04aac314a
 DIST rebase-1511.tar.xz 95276416 SHA256 e8b0686ad02d15d833febf5f353cb66febfccb730fb7e92968b05739d8d4a494 SHA512 b7998763a092389be8d5eb4b9c59a7297859d4f03be6a4c3933288d5407fe1b64268d6fb03b7df0604ad0801991937ee345c2f932c9621ea7bab4d68c9c59261 WHIRLPOOL 53ce94b77fb5b1557b790bad48064066833f6800ebef29a33f80e3fa6b8dbf0666443dc0301521e88d4e9f38579011edc37979f12b95cd84ea8afb07f7e8ffc7
 DIST rebase-1601.tar.xz 99890720 SHA256 de0f7dd6cf831c52434e7434491b9c738c41aab51c8f8d91b243569f25209eb8 SHA512 a6e3faf7fc2eaf475605ed72db7f1cfdc4ba8c280f1650f723c5a664090ed64e7ac014012042c466d65edea8b2767bbcb0f38c3d5b69dbdb35e89cf0685c92ad WHIRLPOOL f06338c0d6ef59d7ac792f6f7fc48338b73d659614c0694109152fd33606174be6741cb662478f38e37e9622118de27c3c30c537b741b49e218f64973fe2c783
diff --git a/sci-biology/rebase/rebase-1509.ebuild b/sci-biology/rebase/rebase-1509.ebuild
deleted file mode 100644
index 0088b50aa25b..000000000000
--- a/sci-biology/rebase/rebase-1509.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV=${PV#1}
-
-DESCRIPTION="A restriction enzyme database"
-HOMEPAGE="http://rebase.neb.com"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emboss minimal"
-
-RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-src_compile() {
-	if use emboss; then
-		echo; einfo "Indexing Rebase for usage with EMBOSS."
-		mkdir REBASE || die
-		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
-				-protofile proto.${MY_PV} -equivalences \
-				|| die "Indexing Rebase failed."
-		echo
-	fi
-}
-
-src_install() {
-	if ! use minimal; then
-		insinto /usr/share/${PN}
-		doins withrefm.${MY_PV} proto.${MY_PV}
-	fi
-	newdoc REBASE.DOC README
-	if use emboss; then
-		insinto /usr/share/EMBOSS/data/REBASE
-		doins REBASE/embossre.{enz,ref,sup}
-		insinto /usr/share/EMBOSS/data
-		doins REBASE/embossre.equ
-	fi
-}
diff --git a/sci-chemistry/mongochem/mongochem-0.7.0.ebuild b/sci-chemistry/mongochem/mongochem-0.7.0-r1.ebuild
similarity index 90%
rename from sci-chemistry/mongochem/mongochem-0.7.0.ebuild
rename to sci-chemistry/mongochem/mongochem-0.7.0-r1.ebuild
index 5e6b2b642692..fbb8e7c8acdf 100644
--- a/sci-chemistry/mongochem/mongochem-0.7.0.ebuild
+++ b/sci-chemistry/mongochem/mongochem-0.7.0-r1.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$
 
@@ -19,8 +19,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	dev-db/mongodb[sharedclient]
 	dev-libs/boost[threads]
+	dev-libs/mongo-cxx-driver
 	sci-libs/avogadrolibs[qt4]
 	sci-libs/chemkit
 	sci-libs/vtk[qt4,rendering]
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 085cd021982d..8bedd61967a3 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1 +1,2 @@
 DIST qmapshack-1.3.0.tar.gz 4306608 SHA256 8eb9b07e2170d435aa086930e8c12f53cc9f89e7617adcf6a73b5a76f4081b0d SHA512 bf58bc7a2b9612cddb63801737c31b5910f8cbf255ebbc4abac42cb7404040074436ac6fa9a85982a31c1499cedc21fb13885e4daa650eb3567f8115528db385 WHIRLPOOL d85bbc15df93a9d86c57126f8b8c85dce5e10fcac1ca2b9bb8c32b8abd9f8796e3e4c415d712bf7dc8aa9c8542715f45ca81aca9cfd6d67685fe6984180c5ddd
+DIST qmapshack-1.5.1.tar.gz 4041000 SHA256 109f7979781cea2e455556368fc04ee499ffbe86493c8a4dea7fab65818e1f1d SHA512 6ce4732f42bbc14ddd67094431205b6ddb724e6841913e00a3ecbfb386e94aae7f4cf4062f0a9b0ba4a60df696dee11c4de5036c17a5b8b3cea331a3a0786672 WHIRLPOOL e95b7d85f1f89effee61a0cef090ca026b8d45e2192ee7e03d9f775bb7326d2510bf3cc1c355d6d5f2882a7449238f952d1a6d80801376325c4f08515aba3746
diff --git a/sci-geosciences/qmapshack/qmapshack-1.5.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.5.1.ebuild
new file mode 100644
index 000000000000..d87dcc160c10
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+	dev-qt/qtscript:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	>=sci-geosciences/routino-3.0_p1
+	sci-libs/gdal
+	sci-libs/proj"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
new file mode 100644
index 000000000000..222a9cc2d6e8
--- /dev/null
+++ b/sci-geosciences/routino/Manifest
@@ -0,0 +1 @@
+DIST routino-3.0_p1.tgz 957022 SHA256 037892a09cf2bb790d895d218a80c221e9595a3943ca35163c71ed93b111431e SHA512 be6275e8fcc0fe535a0940ba26fdf8e8ecfde768e4b2baaabf088a39431dc259933c3aa02ff3e28c5bf145402d18e6369a16d2c7a50fd1b84695dd31c155341f WHIRLPOOL 1e097aaa00437e08b485f4ce9d027cb31f3e320b5f61883a230ad235ccea8ca53c79bf0e428013434b91d0533f1212c43dd8a9f05eec2394cced070f83eb61ef
diff --git a/sci-geosciences/routino/files/makefile-conf.patch b/sci-geosciences/routino/files/makefile-conf.patch
new file mode 100644
index 000000000000..ca751312890f
--- /dev/null
+++ b/sci-geosciences/routino/files/makefile-conf.patch
@@ -0,0 +1,35 @@
+diff -r -U1 routino-3.0.orig/Makefile.conf routino-3.0/Makefile.conf
+--- routino-3.0.orig/Makefile.conf	2015-09-08 00:11:23.000000000 +0600
++++ routino-3.0/Makefile.conf	2016-01-04 13:02:46.557516477 +0600
+@@ -47,3 +47,3 @@
+ ifneq ($(HOST),MINGW)
+-prefix=/usr/local
++prefix=/usr
+ bindir=$(prefix)/bin
+@@ -51,3 +51,3 @@
+ libdir=$(prefix)/lib
+-docdir=$(prefix)/doc/routino
++docdir=$(prefix)/share/doc/$(PF)
+ datadir=$(prefix)/share/routino
+@@ -69,3 +69,3 @@
+ # Language dialect selection
+-CFLAGS=-std=c99
++CFLAGS+=-std=c99
+ 
+@@ -75,3 +75,3 @@
+ # Optimisation options
+-CFLAGS+=-O3
++#CFLAGS+=-O3
+ CFLAGS+=-ffast-math
+@@ -86,3 +86,3 @@
+ # Maths library
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+ 
+@@ -121,4 +121,4 @@
+ # Required for xz support (uncomment these two lines if required)
+-#CFLAGS+=-DUSE_XZ
+-#LDFLAGS+=-llzma
++CFLAGS+=-DUSE_XZ
++LDFLAGS+=-llzma
+ 
diff --git a/sci-geosciences/routino/metadata.xml b/sci-geosciences/routino/metadata.xml
new file mode 100644
index 000000000000..577c6e944a64
--- /dev/null
+++ b/sci-geosciences/routino/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    An application for finding a route between two points using the dataset
+    of topographical information collected by http://www.OpenStreetMap.org.
+    This router uses a routing algorithm that takes OSM format data as its input
+    and calculates either the shortest or quickest route between two points.
+    To optimise the routing a custom database format is used.
+    This allows the routing to be performed quickly after a modest one-off pre-processing stage. 
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/routino/routino-3.0_p1.ebuild b/sci-geosciences/routino/routino-3.0_p1.ebuild
new file mode 100644
index 000000000000..698b897d9b14
--- /dev/null
+++ b/sci-geosciences/routino/routino-3.0_p1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+
+DESCRIPTION="Routing application based on openstreetmap data"
+HOMEPAGE="http://www.routino.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tgz"
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND="!<sci-geosciences/qmapshack-1.5"
+PATCHES=( "${FILESDIR}"/makefile-conf.patch )
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake -j1
+}
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index 14adf0dad436..8db46f510006 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-mathematics/nestedsums/nestedsums-1.4.12-r1.ebuild b/sci-mathematics/nestedsums/nestedsums-1.4.12-r1.ebuild
index b106f0a002dd..b1d8c56fb805 100644
--- a/sci-mathematics/nestedsums/nestedsums-1.4.12-r1.ebuild
+++ b/sci-mathematics/nestedsums/nestedsums-1.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="3"
@@ -8,7 +8,7 @@ IUSE="doc"
 SRC_URI="http://wwwthep.physik.uni-mainz.de/~stefanw/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 RDEPEND=">=sci-mathematics/ginac-1.5"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild
index 9ce966faa058..0c88f0ef001c 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.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"
 
 IUSE=""
-MODS="subsonic"
+MODS="cgmanager"
 
 inherit selinux-policy-2
 
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
index 9ce966faa058..0c88f0ef001c 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.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"
 
 IUSE=""
-MODS="subsonic"
+MODS="cgmanager"
 
 inherit selinux-policy-2
 
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild
index 3e3a90031e02..79c0d1894568 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.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"
 
 IUSE=""
-MODS="subsonic"
+MODS="cgmanager"
 
 inherit selinux-policy-2
 
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
index 3e3a90031e02..79c0d1894568 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-9999.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"
 
 IUSE=""
-MODS="subsonic"
+MODS="cgmanager"
 
 inherit selinux-policy-2
 
diff --git a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
index 45fbeb388af5..2aef2c63610d 100644
--- a/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dl.lm-sensors.org/i2c-tools/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="python"
 
 RDEPEND="!<sys-apps/lm_sensors-3
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index efd37a5a53cf..41845c8312e9 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,3 +1,4 @@
 DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
 DIST pciutils-3.3.1.tar.gz 393912 SHA256 02beeb14503707c5a3293fe084c18e12e6937c0d4dd1e29e6bcb6b12f124df46 SHA512 4f8b0e62cfd0ffad1674be13c95f5581bc0037ed9843f9866b13eea6fa2703bb39bb878e96df805972f4e9bac36fc67a0a313c463f0764218211f1276cef36b2 WHIRLPOOL 315f1f4f5b98e6e90e3a6af9a8a03acf9732eb5b6de02ced53b32bdaca67360153ee4db1551729e3534d25c81ce2308d89c0715e0554552d029cbb3f18786ff6
 DIST pciutils-3.4.0.tar.gz 398285 SHA256 ba6244652723e137001e69d6081497d462cbff6ba0acec38cc81c20ea1ac0d7e SHA512 a27b2209bd88eedf9f6be4abaad86c8219859dff15029f1a2eec5513b9a61279eba831b7ffc89b49fb45ad8d2be8c4ababc5ee9b219e1575c2b430a0f1c93877 WHIRLPOOL b68d23e987ea988686882a392160149574de467d2073343f169a07c75ca55b2811b747b988bbd0c5693cc45210c7c6f0e3349dfef7cb37f1f205c8b65cee4827
+DIST pciutils-3.4.1.tar.gz 404166 SHA256 0196624282c33a9bcd4bd097d4100271c82af47797ecd7488ef2711fa5f043b2 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49 WHIRLPOOL 4391c84695dc1f0844129ff5d6056ac1332d855824e1b96ec105073b97d453db21e82d2a071f1bf7d977e26cf51421183b5a37d5a962bccbed9c2667c813cc4c
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
new file mode 100644
index 000000000000..1b405967e7cc
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.4.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="kmod? ( sys-apps/kmod )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${DEPEND}
+	kmod? ( virtual/pkgconfig )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/misc' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}/static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+		"${ED}"/usr/share/man/man8/update-pciids.8*
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+	fi
+}
diff --git a/sys-apps/portage/portage-2.2.26.ebuild b/sys-apps/portage/portage-2.2.26.ebuild
index 94860ee93fc6..1e486b99f61a 100644
--- a/sys-apps/portage/portage-2.2.26.ebuild
+++ b/sys-apps/portage/portage-2.2.26.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
 
diff --git a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
index a7d405a0bdea..4732dfeb4966 100644
--- a/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.8.2.ebuild
index 2c8d4883369a..02b9e6f0fb29 100644
--- a/sys-firmware/seabios/seabios-1.8.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.8.2.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$
 
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-2
 else
-	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
 	# http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
 	SRC_URI="!binary? ( http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
@@ -35,14 +35,14 @@ SLOT="0"
 IUSE="+binary debug +seavgabios"
 
 REQUIRED_USE="debug? ( !binary )
-	ppc? ( binary )
-	ppc64? ( binary )"
+	!amd64? ( !x86? ( binary ) )"
 
+# The amd64/x86 check is needed to workaround #570892.
 DEPEND="
-	!binary? (
+	amd64? ( x86? ( !binary? (
 		>=sys-power/iasl-20060912
 		${PYTHON_DEPS}
-	)"
+	) ) )"
 RDEPEND=""
 
 pkg_pretend() {
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index de964128f976..0e1c9857f9be 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -3,3 +3,4 @@ DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1
 DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba
 DIST dracut-041.tar.xz 268288 SHA256 8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251 SHA512 358444588febfc482627eb5423b8a87b588ed3842ae814b9f88d8c5dfec28419f2aea92cd54c11c4949b9968d60d7e05ba9cfea78d26d2dc6f2a943a38b28dac WHIRLPOOL ab538fe1ffeb3d43185c6222a6e65af8c684b292be571e0571fdd69011f654c3093f3a2256f3003d5dbaf07d0a26f83d82055885bae1868738ad15dc74982e72
 DIST dracut-043.tar.xz 272744 SHA256 1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 SHA512 a36271e1ed4c1205a01bece7652095a8bfd722bcf7239a93baeb21e7e0a60fa86dd6657aa69b594241981056c87c6fe9d372f18ac045785122a9cafe8b0c31eb WHIRLPOOL d1efd59e2c41478e489d4707114b141e8bb0501c54209e364edc2060d3ffac7f2e1afd640b0812a452e7fbe7f9134e5e96436f0f1f2a54613d9468f9dca61a0c
+DIST dracut-044.tar.xz 280004 SHA256 84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d WHIRLPOOL 684591df596fa902447e671adfaeeb8cdc469c257f756616e42747835b71be7caaac9c72bd4b1a5ba5728ec4332baaba1d265cddb1c30cbfa65cf4dce0690bc0
diff --git a/sys-kernel/dracut/dracut-044.ebuild b/sys-kernel/dracut/dracut-044.ebuild
new file mode 100644
index 000000000000..8d1e45c63ad5
--- /dev/null
+++ b/sys-kernel/dracut/dracut-044.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	systemd? ( >=sys-apps/systemd-199 )
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>sys-apps/kmod-5[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+		sys-apps/systemd-sysv-utils
+	)
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsepol
+		sec-policy/selinux-dracut
+	)
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	virtual/pkgconfig
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+QA_MULTILIB_PATHS="
+	usr/lib/dracut/dracut-install
+	usr/lib/dracut/skipcpio
+	"
+
+#
+# Helper functions
+#
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+	local force m
+	[[ $1 = -f ]] && force=-f
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm ${force} --interactive=never -r "${modules_dir}"/$m
+		else
+			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+src_prepare() {
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	if [[ ${SYMLINK_LIB} = yes ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	fi
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	sed -e "3alibdirs=\"${libdirs}\"" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use systemd; then
+		local systemdutildir="$(systemd_get_utildir)"
+		local systemdsystemunitdir="$(systemd_get_unitdir)"
+		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+			--variable=systemdsystemconfdir)"
+		[[ ${systemdsystemconfdir} ]] \
+			|| systemdsystemconfdir=/etc/systemd/system
+		einfo "Setting systemdutildir to ${systemdutildir} and ..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	else
+		local systemdutildir="/lib/systemd"
+		einfo "Setting systemdutildir for standalone udev to" \
+			"${systemdutildir}..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--libdir=${MY_LIBDIR}"
+	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+	if use systemd; then
+		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+	emake doc install/dracut-install skipcpio/skipcpio
+}
+
+src_install() {
+	default
+
+	local my_libdir="${MY_LIBDIR}"
+	local dracutlibdir="${my_libdir#/}/dracut"
+
+	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+	insinto "${dracutlibdir}/dracut.conf.d/"
+	newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dodir /var/lib/dracut/overlay
+
+	dohtml dracut.html
+
+	if ! use systemd; then
+		# Scripts in kernel/install.d are systemd-specific
+		rm -r "${D%/}/${my_libdir}/kernel" || die
+	fi
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	if use systemd; then
+		# With systemd following modules do not make sense
+		rm_module 96securityfs 97masterkey 98integrity
+	else
+		rm_module 00systemd 98dracut-systemd
+		# Without systemd following modules do not make sense
+		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
+	fi
+
+	# Remove modules which won't work for sure
+	rm_module 95fcoe # no tools
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips 02fips-aesni
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+		local opt desc
+
+		# Generate ERROR_* variables for check_extra_config.
+		for opt in ${CONFIG_CHECK}; do
+			opt=${opt#\~}
+			desc=desc_${opt}
+			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+				"is missing and REQUIRED'"
+		done
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked.  Do you have"
+		ewarn "/usr/src/linux/.config file there?  Please check manually if"
+		ewarn "following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 521cf84360e8..3a3337ef8129 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,3 +6,4 @@ DIST patch-4.4-rc4.xz 6583896 SHA256 e2a1f4198c0f56b0fb9cdf7056a3efb5c99d117e6c5
 DIST patch-4.4-rc5.xz 6618504 SHA256 d976f02cae338d12981c1d9479077379ac7b7b8210fa216549ca24c51b68d85a SHA512 38f1d3b1999374850e7c857d35afeca38d7ae253face09cc689220b38aa0e87a53effcfee13ad6b821a0a7b8a1a9c0ab7a2c0b114d63dbf44f48a41f0c32483f WHIRLPOOL 765f27ca1270a2d3b0d0013a34f71d3891742e57b18f641eacb1ba070abfa8928a7bea7b8e42717ac6568930e83db5c6d113bee40d0a46b17abfb03778b1c42e
 DIST patch-4.4-rc6.xz 6663416 SHA256 e4dde89da4c186e16f0af79fb812314a1afb2746349b57831baebb9c762b6c78 SHA512 a8b362c98f76997070e2b8703836c00e5938c37c9c3cf77f4d68c77f78ee5935e305210681c8d45d534027abca249e0b607a57fc4f7df15b756c2a32e4401427 WHIRLPOOL c3e6ba088509c3aa27da021aac74602d90a308d6c66440646ac97a046e644428cd9749d98e3dbcadb9cf6526fb35fea621e83fbd73e1233be8d261060c2d27aa
 DIST patch-4.4-rc7.xz 6677688 SHA256 263c181c3d3a53e9bcd501dbc8f8afc6ed8b81f695bc5a670271530f1e671104 SHA512 3895e3a9515f215bdc3f57c9106392dbd19c7ec1b7c360f405b5e203fa1419487781e85416441b14dad46e03c4389d62d0eda18a0a42d26a1a75b47bcb1a81d2 WHIRLPOOL 72d7cd2daea90837ab7e20dc961c50f5e5e77b9a3501ae2ba165d8d0b80656426db6e100243f4555a40301667a63621c127df4b410d814d09c115f469312c5ce
+DIST patch-4.4-rc8.xz 6692052 SHA256 502b516756cb62da6887b680d2f1da211908844c99e3869dd3a1af9f2e9c261e SHA512 875d1954ecf2beff9fe64879d290604958f1f5d7e18cf3cf37327746e2f8175d950a1bc88aec9749d5a753bf1e255ecb4406a63504d7c4738575d86bb27159a9 WHIRLPOOL 24086d6d672ed33f54813476361bdbdd4f90ebf9f10caff8726a8e7a90eb9546482e841249a6ef861987a53333bb2c0c867afe786f7b8c09bcb54ff7b68591da
diff --git a/sys-kernel/git-sources/git-sources-4.4_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.4_rc8.ebuild
new file mode 100644
index 000000000000..5b6ded7aad84
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.4_rc8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 7d5aa1d26a76..8606147ad30d 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,9 +8,9 @@ DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc0
 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST patch-3.10.94.xz 1203604 SHA256 8cae358c7c2dd7f14485b4e2f4963ad7e41400884e72a0c30cf8b0e4c9c3d40f SHA512 6ee8b86e770f0a75ae24a2ef886231b8a577ee1d696ea37a79cd2f1b3d34fac6ee33d2a061941f3d690f564b8bf37c1cec0d9bded7a416ea00cd38dcb9f5f3d8 WHIRLPOOL 26b88a2100f57cc075b6291e1ce23ce445332d40c14922e9fc28ef621a7994a3403a3b1296b1a02b49815bd099edfe462151335750e3fd147ff84640142df92e
-DIST patch-3.12.50.xz 1390376 SHA256 37809e5d7b0877bf62b2d1f7cb03f079ee7299b3afce2b4eb339cbef32f80c33 SHA512 15f07ada969b484ded0b96461525da46d41aebca38bf13cb76ddc9199eb4f8d4e714da14e82a04ea674df766002661ef566a0e7c6bd94bef979619bc181ad70b WHIRLPOOL eda11f2eda7e4fcd72f7ff6b64f1ea2a2a7e22bbb2376173ee0fc4e1648eddeda21315227069e0975d831638840728e360ec202f63ee69bbb2feccef40bca74c
+DIST patch-3.12.51.xz 1402936 SHA256 6b7eedb0e67139d5d9c774911a5d44c417597449a8239e6bd70af3d43e638867 SHA512 0700cc33af5ce37c2a1959ec31423ec0cbb2e2bfeb93dd2a535789e92f818059ad150d56f50d8925cc46e79fd7d0c583f2b0e9c81548565e9baa3d8a5c692b43 WHIRLPOOL 9d7c90f12f62ca7a1f407f9bf9a8b14d0b0556c82d74c6a7b4faf46219b9988d3cab683aaf1fba2d108c38151c2ae41ff0db303776184ca90e0071af8354f2f4
 DIST patch-3.14.58.xz 1039716 SHA256 e65bbccf03522a609b88c8186eef4cdb41c35bd6f9416b767b67c11718e26d6b SHA512 d7b946dbe01c8b0167c75cbc1e328c43244218b653c7a3c29024c5a59a82645f1d652d25c957ecc692d1fa9b2e03c8c082905bac1df13e5238cbad261b342f3c WHIRLPOOL 8418ca4ab6a8270d1c33b0c2ad6dd24f4904fab1d3168b05ee143b56828f808ea266d8b8db5bc69b5263a0b7a038ee1b5244cf034834ff1b2d5135558ea94c87
-DIST patch-3.18.23.xz 690832 SHA256 52406a0efaefdffd6464ce5866213fa6c800d08d3e8c3af19f01a38c237e5212 SHA512 b52747facd9049ed3dc32f75aec605766e29c538204eb585ee029e6dea5a763921ac00e7778c42b2033dec8f5543e8eaccfefca3f9aba1a0345894cdc58b77fc WHIRLPOOL 3c61f2b884a8d4b4305b16954d4f0e83cba57fd862d11d0aa596c80e057fba84440d9aca10ae5c3a62caefcfe1cbf188d0811d279a507e5fe203356a4d108e1e
+DIST patch-3.18.25.xz 716948 SHA256 78df9b97449715fa4e39158fc27fadbdbb50eab04ac29d1374a95bebaf7adfbf SHA512 c706e0e12086dcc7783eb0a92cc96e375c1b22d013de1015d1940d1eff2d2a9c9540184d4d4796fb8cf1e69edb8ba7afc25af5646dda865795c63c3ebacdd268 WHIRLPOOL 4a33bdc15f2a6d1430c2c2f30a52bdf25ba92eb713b97953803169067c11821700f8186a32720339adcc83b12f34e56426615010f3d2d2d01b27c532e408d052
 DIST patch-3.2.75.xz 1521852 SHA256 2bf398fe6e7e465c131a6b308e5b6d0d111d8ecb9a382a5ce663a96d75e7b089 SHA512 fb4f84d1680b696a8bc0a8c64b4a70aeb61c9b0b9afc9dcee0a1776b7067f693bfdc90bbc16ca9df25212992f1b4ee4dc3ebb54747f9d8e935e304da55d9cc9d WHIRLPOOL 770b41f3c2a836a8bbc344ef60c09215994764a9e42e9d9e9fbb9a35b770c0acaeff2bf3e677670437cdeef32a4f49328fc7b3d0380917d3e0275089c8e43d3f
 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
 DIST patch-4.1.15.xz 433040 SHA256 0ffca8557f1aa191da2f2260ad279c9cc858e6308a8af8a76f7ca3d3c0540344 SHA512 646daf16c01fb8c3013c7c9919c18c3635eb6bd37560623cb56cc7a6d0b22fb13290cee8865dfbcc435cd8544cc3ecb6f3aae538d10c9e0b1098806f233155a3 WHIRLPOOL de84d094927463fd425f7bac7d665aee593e41c44354a240db80653a60bc486dbb9dada6a3a84cc29995d03d1f480905878ea21a1299ca71b2a8e6ca58303351
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.50.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.51.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.12.50.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.12.51.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.25.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.18.23.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.18.25.ebuild
diff --git a/sys-libs/libnih/libnih-1.0.3-r3.ebuild b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
index b34698555207..992edd17d5ec 100644
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86"
 IUSE="+dbus nls static-libs +threads"
 
 # The configure phase will check for valgrind headers, and the tests will use
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index d5e19256c3f3..21ea4cbcf1a2 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -5,3 +5,4 @@ DIST newlib-2.0.0.tar.gz 15868470 SHA256 49c29e9129325e7c3b221aa829743ddcd796d02
 DIST newlib-2.1.0.tar.gz 16199705 SHA256 3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48 SHA512 6770864f9307abb2401a4e48f286845d3a4afc30b2ac987da4b964a5485cc3823b32d06a0abf61528e93c4ad8a3a0aa3cc1ecd3b033850e6b2bde6d9bbc9a547 WHIRLPOOL 6faba54a72c6242c694f43a7f2e62d23584fec658818201ee58e1d2954d45b58a5f4effd63f5274b99748ed7730db76e0cf2aa1ecfbdf7001f10929d7db6353c
 DIST newlib-2.2.0.20150423.tar.gz 17485660 SHA256 b1ff3642b246adc6ee546884cb9ea3b0913f17394cbf7ca4d3b82544fef759f7 SHA512 0eecaf5dbf6caf0e0fca3697dfd70e5f60ecbc0a3365852586bc40a32bd535ef0936fa7fc68fceda3426cdb9b6259de12ed00303cadeea09d95b5f1a07022bae WHIRLPOOL 37d78cf24a072819bcf098e3b384cf6fa3a11ded461d6fb12e8635169fcb8b638400622878ad947df55236957a6ce3884ad46f02f7351414842eb048ceed7d73
 DIST newlib-2.2.0.tar.gz 16521910 SHA256 f8add263b0737591aff451b12a00c262c2efac4fa87d741fa1c318fc3bb335be SHA512 ab9161f16845367c823b6709e3c5708969f29f05c77edb1cf969ff4202f358648f1e55080974599dcefed2fbced4694dc73748596e76c1aa37c50cddff6e4be3 WHIRLPOOL 8dfc23f93d774c5092d64d1482c3ecc6e3ba35395822bb1d52f5e3b86f644ee803927bff133883926f3e019cfd5d9f04ffe0dcaac20bdf144c542ba1dc3edff9
+DIST newlib-2.3.0.20160104.tar.gz 17674117 SHA256 c92a0e02904bd4fbe1dd416ed94e786c66afbaeae484e4c26be8bb7c7c1e4cd1 SHA512 d83ce298b1b72eabf92e4ec14af3afdf3122e34aff5e320295a398df077235a78aa87148895b441a4f7de3047815e7ce13ea06a06135dd86b69a200236514293 WHIRLPOOL 41ab57955b886dad8988bd06a18c1b5bbf21c7b554410711c17141bbc12d70af2f6ce6f9d3503c11180d46b42bcf305c6347ea58252d24459dc02c568aeb8497
diff --git a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
new file mode 100644
index 000000000000..8c40312c0ad2
--- /dev/null
+++ b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://sourceware.org/git/newlib.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
+#	if [[ ${PV} != *.201[5-9]???? ]] ; then
+		KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+#	fi
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="http://sourceware.org/newlib/"
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+NEWLIBBUILD="${WORKDIR}/build"
+
+pkg_setup() {
+	# Reject newlib-on-glibc type installs
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+			*-newlib|*-elf) ;;
+			*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
+		esac
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	# we should fix this ...
+	unset LDFLAGS
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	local myconf=""
+	[[ ${CTARGET} == "spu" ]] \
+		&& myconf="${myconf} --disable-newlib-multithread" \
+		|| myconf="${myconf} $(use_enable threads newlib-multithread)"
+
+	mkdir -p "${NEWLIBBUILD}"
+	cd "${NEWLIBBUILD}"
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable unicode newlib-mb) \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C "${NEWLIBBUILD}"
+}
+
+src_install() {
+	cd "${NEWLIBBUILD}"
+	emake -j1 DESTDIR="${D}" install
+#	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	# minor hack to keep things clean
+	rm -fR "${D}"/usr/share/info
+	rm -fR "${D}"/usr/info
+}
diff --git a/www-apps/bugzilla/bugzilla-4.4.11.ebuild b/www-apps/bugzilla/bugzilla-4.4.11.ebuild
index aa079fb4eea7..62a4b5225176 100644
--- a/www-apps/bugzilla/bugzilla-4.4.11.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="https://www.bugzilla.org"
 
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="modperl extras graphviz mysql postgres sqlite test"
 REQUIRED_USE=" || ( mysql postgres sqlite )"
diff --git a/www-apps/bugzilla/bugzilla-5.0.2.ebuild b/www-apps/bugzilla/bugzilla-5.0.2.ebuild
index 89d446f58148..1ae1f1bbad47 100644
--- a/www-apps/bugzilla/bugzilla-5.0.2.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="https://www.bugzilla.org"
 
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="modperl extras graphviz mysql postgres sqlite test"
 REQUIRED_USE=" || ( mysql postgres sqlite )"
diff --git a/www-client/seamonkey/seamonkey-2.39.ebuild b/www-client/seamonkey/seamonkey-2.39.ebuild
index 628b69fe14f4..48f1fc6d19a1 100644
--- a/www-client/seamonkey/seamonkey-2.39.ebuild
+++ b/www-client/seamonkey/seamonkey-2.39.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$
 
@@ -175,6 +175,9 @@ src_configure() {
 	mozconfig_init
 	mozconfig_config
 
+	# We want rpath support to prevent unneeded hacks on different libc variants
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
index 6d0efd1dfbf3..2e0167a5196b 100644
--- a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2-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$
 
@@ -56,7 +56,7 @@ LANG_SUPPORT_EXTENDED=( lua php pypy python python_asyncio python_gevent ruby )
 # *java*: TODO
 # v8: TODO
 # matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq"
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
 
 for plugin in ${UWSGI_PLUGINS_STD[@]}  ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
 for plugin in ${UWSGI_PLUGINS_OPT[@]}  ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
@@ -123,6 +123,7 @@ CDEPEND="sys-libs/zlib
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
 	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
 
 want_apache2
diff --git a/www-servers/uwsgi/uwsgi-2.0.12.ebuild b/www-servers/uwsgi/uwsgi-2.0.12.ebuild
index cd170b2d9b29..ec8caf052291 100644
--- a/www-servers/uwsgi/uwsgi-2.0.12.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.12.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$
 
@@ -56,7 +56,7 @@ LANG_SUPPORT_EXTENDED=( lua php pypy python python_asyncio python_gevent ruby )
 # *java*: TODO
 # v8: TODO
 # matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq"
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
 
 for plugin in ${UWSGI_PLUGINS_STD[@]}  ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
 for plugin in ${UWSGI_PLUGINS_OPT[@]}  ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
@@ -125,6 +125,7 @@ CDEPEND="sys-libs/zlib
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
 	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
 
 want_apache2
diff --git a/www-servers/uwsgi/uwsgi-2.0.9.ebuild b/www-servers/uwsgi/uwsgi-2.0.9.ebuild
index d378ed1368a5..4d7251d187fc 100644
--- a/www-servers/uwsgi/uwsgi-2.0.9.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.9.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$
 
@@ -56,7 +56,7 @@ LANG_SUPPORT_EXTENDED=( lua php python python_asyncio python_gevent ruby )
 # *java*: TODO
 # v8: TODO
 # matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing +ssl +xml yajl yaml zeromq"
+IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq"
 
 for plugin in ${UWSGI_PLUGINS_STD[@]}  ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
 for plugin in ${UWSGI_PLUGINS_OPT[@]}  ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
@@ -118,6 +118,7 @@ CDEPEND="sys-libs/zlib
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
 	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
 
 want_apache2
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
index b1cfe533972f..775d5a330656 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-misc/bbrun/files/bbrun-1.6-list.patch b/x11-misc/bbrun/files/bbrun-1.6-list.patch
new file mode 100644
index 000000000000..654b4f68144e
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2002-02-05 18:36:19.000000000 +0100
++++ wmgeneral/list.c	2016-01-04 12:54:39.666670005 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2002-02-05 18:36:19.000000000 +0100
++++ wmgeneral/list.h	2016-01-04 12:54:39.666670005 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch b/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
deleted file mode 100644
index d81824b0ed0f..000000000000
--- a/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Respect {C,LD}FLAGS
-
---- bbrun/Makefile
-+++ bbrun/Makefile
-@@ -1,7 +1,7 @@
- CC     = gcc
- LIBDIR = -L/usr/lib -L/usr/X11R6/lib
- LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
--CFLAGS = `pkg-config --cflags gtk+-2.0`
-+GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`
- 
- OBJS   = bbrun.o \
-          ../wmgeneral/wmgeneral.o \
-@@ -11,10 +11,10 @@
- all: bbrun
- 
- .c.o:
--	$(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
-+	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c -Wall $< -o $*.o
- 
- bbrun: $(OBJS)
--	$(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -o bbrun $^ $(LIBDIR) $(LIBS)
- 
- install:
- 	cp bbrun /usr/local/bin/
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 2132242a5475..edddeac9c733 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,3 +1,4 @@
+DIST i3status-2.10.tar.bz2 53684 SHA256 daf5d07611b054a43da1a3d28850b05e2dbdbd6d25fd5e25ede98bb1b66e2791 SHA512 a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85 WHIRLPOOL 8f585e208a0764e1caf43aa99bb401261f84e7fc7973aa1448a752710e8997dd3492e686a65b2318a3d30534f6073a7e207cb366f5852a0ce63e8a86f709ccbc
 DIST i3status-2.7.tar.bz2 37594 SHA256 073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632 SHA512 7db6aded37e131c75e99f939102ac3b953817456921eec6b9054b6c4e0855f8d1f20638cbcd0f0b18ad24201041a01ade98c4d4cde6ff14bb11508454b8d3062 WHIRLPOOL 3bc2b599cda1d0f9e5442f03dc4e8700f84172c45d193b502f2894420c9be4a5c93022d199a718864a34c8fbbd6dc9d0d911c4c484a826fa4640514418e2f887
 DIST i3status-2.8.tar.bz2 40422 SHA256 ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe SHA512 b1e3dbc480660a96a662ccb996769203fae22448f8801cabb56c339ba63ac84d30018c897e2ecac23f513cfe9d9a7d9200a351a2e6b10a42c1929c28e8e22c02 WHIRLPOOL 84444845a10bcdfd68336439c92197629b5e426e474dcfe68fd9cc11b7097476c32337c360429b344fdbe03e70d8b47c5eefd3f489bf2b78fd1df3f2f091a568
 DIST i3status-2.9.tar.bz2 46615 SHA256 42eb09500c625fcac9a7125a29e7bf532ca4b8540942418ee3253aa15e5e9de3 SHA512 67d026fcb4cc2a8af39cc268c962d49c4d3f2473bad92d99fa7fba876235ac83471663b318f890e9d7d3e9e06897286d693d352e686376a3a4876f253f309cb6 WHIRLPOOL 1a94da2c5d3bc4585908367b14ca1b18fada2a0d3c93a231969e6b92586a66bbcf5f67b0952bc6535e44f2e3ef1f66f000b55049b586821697f4fb26783da6cf
diff --git a/x11-misc/i3status/i3status-2.10.ebuild b/x11-misc/i3status/i3status-2.10.ebuild
new file mode 100644
index 000000000000..1801fdfa96cb
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs versionator fcaps
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="http://i3wm.org/i3status/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/confuse
+	dev-libs/libnl:3
+	>=dev-libs/yajl-2.0.2
+	media-libs/alsa-lib
+	media-sound/pulseaudio"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
+		-e '/CFLAGS+=-g/d' -i Makefile || die
+	rm -rf man/${PN}.1  # man not regenerated in tarball
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index d26731105103..3fc6d416a0ee 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-2.7.tar.gz 70574 SHA256 aa430a7613a1cfdce7e99c9f3dc6f097f9a0fa0c75d7cc1f0e2d593afab2cd52 SHA512 3afb387d30e599aad9b2428d63ab5a7ede9775f0b0804f530a87c7a9b4dce4e770041ed6038931c085af63c1e22ce70d12718705e6359ba4abc67041da31e89d WHIRLPOOL 611af2f8a486ed2616c564f4c6808d8b6b34539391fc8f01d9a7e75be7b721020654f6f7d5432d818f44a8fa15e7b12bba186ae489bb8fd53493a355f3cdd336
+DIST py3status-2.8.tar.gz 75031 SHA256 a462609eb05ae1ea31d2fd63cab31ce21ab9e9cdd03b4ef83f538ae727e50d81 SHA512 813a587f43a45492427325a772604f531682ff6d1ddf4cff0778b0e7def57f5a87a296fac254bddc44b8673f828cbe1b4e607d7b5ac391638adcf87b69b6bd54 WHIRLPOOL 4858ab2fd8296bb501076ddc601296b8d1ae4ef57fe4d596d9eb319bcd6efcf370e3dd93dd0de57060635777477c78ae71d996028798aa1b29c8b037a838b08a
diff --git a/x11-misc/py3status/py3status-2.7.ebuild b/x11-misc/py3status/py3status-2.8.ebuild
similarity index 100%
rename from x11-misc/py3status/py3status-2.7.ebuild
rename to x11-misc/py3status/py3status-2.8.ebuild
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index f4580aa40fed..f4c71a77b989 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1 +1,2 @@
 DIST redshift-1.10.tar.gz 519595 SHA256 f7a1ca1eccf662995737e14f894c2b15193923fbbe378d151e346a8013644f16 SHA512 0fd3867d883268279b6297a0eec1bcdc20022a893b935fd4767fbfc0797ad044777af4cf1efcfec7a1f362306ae88869f73b20c91b29844e9e201881c5b56260 WHIRLPOOL 3aa705a5afedb4ebb7fcab98afec0d69ea5c8c7cd280eee72fc2aff260df85d00b0af722ce6fc1e3e04d000e30d37eb2ddca8b82d6a25e9d587f4e0d98bfc626
+DIST redshift-1.11.tar.gz 543804 SHA256 a89cee0dc822fa2bfda0703d8ecedeccc08da3aebdf1880593f28da81c3dc879 SHA512 bcdb4c120efec3955f4f91f1290db0679e987e25d6610bd90ee8540a96bb11338e36b10680736490ea0b7e9eca5bc195b51767a5badf0b80495dc3da44c4ed8c WHIRLPOOL c8bb70fde237bc7fc841d9272c029fe92c7ad564711a377a578cb6c126ae5a24d2756d3df3dc2de8053738301170040284c65a5e1da66fb29755a8e4a4bf5f17
diff --git a/x11-misc/redshift/redshift-1.11.ebuild b/x11-misc/redshift/redshift-1.11.ebuild
new file mode 100644
index 000000000000..e27ddad2f6eb
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.11.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit systemd autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+	appindicator? ( dev-libs/libappindicator )
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		--disable-geoclue \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
new file mode 100644
index 000000000000..c4235061514b
--- /dev/null
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
+HOMEPAGE="http://rio.vg/asmon"
+SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die
+
+	cd "${WORKDIR}"/${P} || die
+	epatch "${FILESDIR}"/${P}-list.patch
+}
+
+src_compile() {
+	emake clean
+	emake SOLARIS="${CFLAGS}" LIBDIR="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ../Changelog
+}
diff --git a/x11-plugins/asmon/files/asmon-0.7.cflags.diff b/x11-plugins/asmon/files/asmon-0.7.cflags.diff
deleted file mode 100644
index b69c692abb90..000000000000
--- a/x11-plugins/asmon/files/asmon-0.7.cflags.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- asmon/Makefile.orig	1999-06-26 03:35:13.000000000 +0200
-+++ asmon/Makefile	2006-08-24 20:21:52.000000000 +0200
-@@ -4,7 +4,7 @@
- #SOLARIS_LIBS = -lsocket -lkstat
- #SOLARIS_OBJS = solaris26.o
- 
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L/usr/lib
- LIBS   = -lXpm -lXext -lX11 $(SOLARIS_LIBS)
- OBJS =  asmon.o $(SOLARIS_OBJS) \
- 		../wmgeneral/wmgeneral.o \
-@@ -12,16 +12,16 @@
- 		../wmgeneral/list.o
- 
- .c.o:
--	gcc -c -Wall $(SOLARIS) $< -o $*.o
-+	gcc -c -Wall $(CFLAGS) $(SOLARIS) $< -o $*.o
- 
- asmon: $(OBJS)
- 	gcc -o asmon $(OBJS) $(LIBDIR) $(LIBS)
- 
- clean::
- 	for i in $(OBJS) ; do \
--		rm $$i;\
-+		rm -f $$i;\
- 	done
--	rm asmon
-+	rm -f asmon
- 
- install::
- 	cp -f asmon /usr/local/bin
diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/asmon/files/asmon-0.71-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmcube/files/wmcube-0.98-list.patch b/x11-plugins/wmcube/files/wmcube-0.98-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/wmcube/files/wmcube-0.98-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmcube/wmcube-0.98.ebuild b/x11-plugins/wmcube/wmcube-0.98.ebuild
index 139f4976b3e0..98451641c10a 100644
--- a/x11-plugins/wmcube/wmcube-0.98.ebuild
+++ b/x11-plugins/wmcube/wmcube-0.98.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=3
+inherit eutils
 
 DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
 HOMEPAGE="http://kling.mine.nu/kling/wmcube.htm"
@@ -25,6 +26,9 @@ S="${WORKDIR}/${P}/wmcube"
 src_prepare() {
 	#Honour Gentoo LDFLAGS, see bug #337893.
 	sed -e "s/-o wmcube/${LDFLAGS} -o wmcube/" -i Makefile
+
+	cd "${WORKDIR}"/${P} || die
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmgtemp/files/wmgeneral-list.patch b/x11-plugins/wmgtemp/files/wmgeneral-list.patch
new file mode 100644
index 000000000000..66d5c81cc6d3
--- /dev/null
+++ b/x11-plugins/wmgtemp/files/wmgeneral-list.patch
@@ -0,0 +1,129 @@
+diff --git a/wmgeneral/list.c b/wmgeneral/list.c
+index a63562f..0b69885 100644
+--- a/wmgeneral/list.c
++++ b/wmgeneral/list.c
+@@ -38,7 +38,7 @@ Boston, MA 02110-1301 USA.  */
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@ list_cons(void* head, LinkedList* tail)
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@ list_length(LinkedList* list)
+ /* Return the Nth element of LIST, where N count from zero.  If N
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@ list_nth(int index, LinkedList* list)
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;
+@@ -101,7 +101,7 @@ list_remove_head(LinkedList** list)
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@ list_remove_elem(LinkedList** list, void* elem)
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@ list_remove_elem(LinkedList* list, void* elem)
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@ list_find(LinkedList* list, void* elem)
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@ list_free(LinkedList* list)
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff --git a/wmgeneral/list.h b/wmgeneral/list.h
+index 92c3454..3d6bad5 100644
+--- a/wmgeneral/list.h
++++ b/wmgeneral/list.h
+@@ -29,31 +29,25 @@ Boston, MA 02110-1301 USA.  */
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch b/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch
new file mode 100644
index 000000000000..54a2eb2c2887
--- /dev/null
+++ b/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch
@@ -0,0 +1,127 @@
+diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c
+--- src/wmgeneral.orig/list.c	2016-01-04 13:10:41.091981064 +0100
++++ src/wmgeneral/list.c	2016-01-04 13:10:56.428986326 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur src/wmgeneral.orig/list.h src/wmgeneral/list.h
+--- src/wmgeneral.orig/list.h	2016-01-04 13:10:41.091981064 +0100
++++ src/wmgeneral/list.h	2016-01-04 13:10:42.883981679 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild
new file mode 100644
index 000000000000..8974ea955454
--- /dev/null
+++ b/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="CPU and SYS temperature dockapp"
+HOMEPAGE="http://www.fluxcode.net"
+SRC_URI="http://www.fluxcode.net/${P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	=sys-apps/lm_sensors-3*
+	>=sys-apps/sed-4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-list.patch
+
+	sed -i -e "s:-Wall -g:\$(CFLAGS):" src/Makefile || die "sed failed."
+
+	#Honour Gentoo LDFLAGS, rationalizing Makefile - see bug #337411.
+	sed -i -e "s:LDFLAGS =:LIBS =:" src/Makefile || die "sed failed."
+	sed -i -e "s:\$(LDFLAGS) -o \$(BINARY):\$(LDFLAGS) -o \$(BINARY) \$(LIBS):" src/Makefile || die "sed failed."
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dodoc BUGS CREDITS README TODO
+	dobin src/wmgtemp
+	doman wmgtemp.1
+}
diff --git a/x11-plugins/wminet/files/wminet-3.0.0-list.patch b/x11-plugins/wminet/files/wminet-3.0.0-list.patch
new file mode 100644
index 000000000000..9b94f51c6a9a
--- /dev/null
+++ b/x11-plugins/wminet/files/wminet-3.0.0-list.patch
@@ -0,0 +1,300 @@
+diff -Naur wminet-3.0.0.orig/src/list.c wminet-3.0.0/src/list.c
+--- wminet-3.0.0.orig/src/list.c	2001-11-24 12:03:32.000000000 +0100
++++ wminet-3.0.0/src/list.c	2016-01-04 13:45:02.137642820 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wminet-3.0.0.orig/src/list.c.orig wminet-3.0.0/src/list.c.orig
+--- wminet-3.0.0.orig/src/list.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ wminet-3.0.0/src/list.c.orig	2001-11-24 12:03:32.000000000 +0100
+@@ -0,0 +1,169 @@
++/* Generic single linked list to keep various information 
++   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
++
++
++Author: Kresten Krab Thorup
++
++Many modifications by Alfredo K. Kojima
++ 
++
++This file is part of GNU CC.
++
++GNU CC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2, or (at your option)
++any later version.
++
++GNU CC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GNU CC; see the file COPYING.  If not, write to
++the Free Software Foundation, 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* As a special exception, if you link this library with files compiled with
++   GCC to produce an executable, this does not cause the resulting executable
++   to be covered by the GNU General Public License. This exception does not
++   however invalidate any other reasons why the executable file might be
++   covered by the GNU General Public License.  */
++
++#include "list.h"
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#include <stdlib.h>
++
++/* Return a cons cell produced from (head . tail) */
++
++INLINE LinkedList* 
++list_cons(void* head, LinkedList* tail)
++{
++  LinkedList* cell;
++
++  cell = (LinkedList*)malloc(sizeof(LinkedList));
++  cell->head = head;
++  cell->tail = tail;
++  return cell;
++}
++
++/* Return the length of a list, list_length(NULL) returns zero */
++
++INLINE int
++list_length(LinkedList* list)
++{
++  int i = 0;
++  while(list)
++    {
++      i += 1;
++      list = list->tail;
++    }
++  return i;
++}
++
++/* Return the Nth element of LIST, where N count from zero.  If N 
++   larger than the list length, NULL is returned  */
++
++INLINE void*
++list_nth(int index, LinkedList* list)
++{
++  while(index-- != 0)
++    {
++      if(list->tail)
++	list = list->tail;
++      else
++	return 0;
++    }
++  return list->head;
++}
++
++/* Remove the element at the head by replacing it by its successor */
++
++INLINE void
++list_remove_head(LinkedList** list)
++{
++  if (!*list) return;  
++  if ((*list)->tail)
++    {
++      LinkedList* tail = (*list)->tail; /* fetch next */
++      *(*list) = *tail;		/* copy next to list head */
++      free(tail);			/* free next */
++    }
++  else				/* only one element in list */
++    {
++      free(*list);
++      (*list) = 0;
++    }
++}
++
++
++/* Remove the element with `car' set to ELEMENT */
++/*
++INLINE void
++list_remove_elem(LinkedList** list, void* elem)
++{
++  while (*list)
++    {
++      if ((*list)->head == elem)
++        list_remove_head(list);
++      *list = (*list ? (*list)->tail : NULL);
++    }
++}*/
++
++INLINE LinkedList *
++list_remove_elem(LinkedList* list, void* elem)
++{
++    LinkedList *tmp;
++    
++    if (list) {
++	if (list->head == elem) {
++	    tmp = list->tail;
++	    free(list);
++	    return tmp;
++	}
++	list->tail = list_remove_elem(list->tail, elem);
++	return list;
++    }
++    return NULL;
++}
++
++
++/* Return element that has ELEM as car */
++
++INLINE LinkedList*
++list_find(LinkedList* list, void* elem)
++{
++  while(list)
++    {
++    if (list->head == elem)
++      return list;
++    list = list->tail;
++    }
++  return NULL;
++}
++
++/* Free list (backwards recursive) */
++
++INLINE void
++list_free(LinkedList* list)
++{
++  if(list)
++    {
++      list_free(list->tail);
++      free(list);
++    }
++}
++
++/* Map FUNCTION over all elements in LIST */
++
++INLINE void
++list_mapcar(LinkedList* list, void(*function)(void*))
++{
++  while(list)
++    {
++      (*function)(list->head);
++      list = list->tail;
++    }
++}
+diff -Naur wminet-3.0.0.orig/src/list.h wminet-3.0.0/src/list.h
+--- wminet-3.0.0.orig/src/list.h	2001-11-24 12:03:32.000000000 +0100
++++ wminet-3.0.0/src/list.h	2016-01-04 13:45:02.137642820 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..0a9534615089
--- /dev/null
+++ b/x11-plugins/wminet/wminet-3.0.0-r1.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 eutils toolchain-funcs
+
+DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
+HOMEPAGE="http://www.swanson.ukfsn.org/#wminet"
+SRC_URI="http://www.swanson.ukfsn.org/wmdock/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-list.patch
+
+	tc-export CC
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README wminetrc
+}
diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 8a3c94955f04..b630a918e3bc 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.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
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz"
@@ -31,6 +31,10 @@ src_prepare() {
 		-e 's/cc -c/${CC} ${CFLAGS} -c/' \
 		-i Makefile || die
 	tc-export CC
+
+	cd "${WORKDIR}"/wmmon.app || die
+	ls
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_install () {
diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index c3ba34cf0e12..f099c9dcd64c 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ S=${WORKDIR}/${P/_beta/b}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch b/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch
new file mode 100644
index 000000000000..da54e7a6d7db
--- /dev/null
+++ b/x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch
@@ -0,0 +1,132 @@
+diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c
+--- src/wmgeneral.orig/list.c	2016-01-04 13:03:23.206828813 +0100
++++ src/wmgeneral/list.c	2016-01-04 13:03:32.358832037 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList * list_cons (void *head, LinkedList * tail)
++LinkedList * list_cons (void *head, LinkedList * tail)
+ {
+   LinkedList *cell;
+ 
+@@ -50,7 +50,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int list_length (LinkedList * list)
++int list_length (LinkedList * list)
+ {
+   int i = 0;
+   while (list)
+@@ -64,7 +64,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void * list_nth (int index, LinkedList * list)
++void * list_nth (int index, LinkedList * list)
+ {
+   while (index-- != 0)
+     {
+@@ -78,7 +78,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void list_remove_head (LinkedList ** list)
++void list_remove_head (LinkedList ** list)
+ {
+   if (!*list)
+     return;
+@@ -98,19 +98,7 @@
+ 
+ 
+ /* Remove the element with `car' set to ELEMENT */
+-/*
+-   INLINE void
+-   list_remove_elem(LinkedList** list, void* elem)
+-   {
+-   while (*list)
+-   {
+-   if ((*list)->head == elem)
+-   list_remove_head(list);
+-   *list = (*list ? (*list)->tail : NULL);
+-   }
+-   } */
+-
+-INLINE LinkedList * list_remove_elem (LinkedList * list, void *elem)
++LinkedList * list_remove_elem (LinkedList * list, void *elem)
+ {
+   LinkedList *tmp;
+ 
+@@ -131,7 +119,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList * list_find (LinkedList * list, void *elem)
++LinkedList * list_find (LinkedList * list, void *elem)
+ {
+   while (list)
+     {
+@@ -144,7 +132,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void list_free (LinkedList * list)
++void list_free (LinkedList * list)
+ {
+   if (list)
+     {
+@@ -155,7 +143,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void list_mapcar (LinkedList * list, void (*function) (void *))
++void list_mapcar (LinkedList * list, void (*function) (void *))
+ {
+   while (list)
+     {
+diff -Naur src/wmgeneral.orig/list.h src/wmgeneral/list.h
+--- src/wmgeneral.orig/list.h	2016-01-04 13:03:23.206828813 +0100
++++ src/wmgeneral/list.h	2016-01-04 13:03:46.741837100 +0100
+@@ -29,12 +29,6 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-#define INLINE inline
+-#else
+-#define INLINE
+-#endif
+-
+ typedef struct LinkedList
+   {
+     void *head;
+@@ -42,20 +36,20 @@
+   }
+ LinkedList;
+ 
+-INLINE LinkedList *list_cons (void *head, LinkedList * tail);
++LinkedList *list_cons (void *head, LinkedList * tail);
+ 
+-INLINE int list_length (LinkedList * list);
++int list_length (LinkedList * list);
+ 
+-INLINE void *list_nth (int index, LinkedList * list);
++void *list_nth (int index, LinkedList * list);
+ 
+-INLINE void list_remove_head (LinkedList ** list);
++void list_remove_head (LinkedList ** list);
+ 
+-INLINE LinkedList *list_remove_elem (LinkedList * list, void *elem);
++LinkedList *list_remove_elem (LinkedList * list, void *elem);
+ 
+-INLINE void list_mapcar (LinkedList * list, void (*function) (void *));
++void list_mapcar (LinkedList * list, void (*function) (void *));
+ 
+-INLINE LinkedList *list_find (LinkedList * list, void *elem);
++LinkedList *list_find (LinkedList * list, void *elem);
+ 
+-INLINE void list_free (LinkedList * list);
++void list_free (LinkedList * list);
+ 
+ #endif
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
index 27fa6d845dd2..3064da43d9a3 100644
--- a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
+++ b/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 inherit autotools eutils
 
-DESCRIPTION="a dockapp that informs events, such as incoming chat messages, by displaying icons and times"
+DESCRIPTION="universal visual notification dockapp"
 HOMEPAGE="http://swapspace.net/~matt/wmmsg"
 SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
 
@@ -28,7 +28,8 @@ DOCS="AUTHORS ChangeLog README wmmsgrc"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-use_gtk2.patch \
-		"${FILESDIR}"/${P}-alt-desktop.patch
+		"${FILESDIR}"/${P}-alt-desktop.patch \
+		"${FILESDIR}"/${P}-list.patch
 
 	eautoreconf
 }
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
index 8e005aa0fbaf..6a078984287b 100644
--- a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
+++ b/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 inherit autotools eutils
 
-DESCRIPTION="a dockapp that informs events, such as incoming chat messages, by displaying icons and times"
+DESCRIPTION="universal visual notification dockapp"
 HOMEPAGE="http://swapspace.net/~matt/wmmsg"
 SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
 
diff --git a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
new file mode 100644
index 000000000000..3769d09d30ee
--- /dev/null
+++ b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
@@ -0,0 +1,116 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:18:09.361133006 +0100
++++ wmgeneral/list.c	2016-01-04 13:18:21.789137166 +0100
+@@ -40,7 +40,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-inline LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -53,7 +53,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-inline int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -68,7 +68,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-inline void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -83,7 +83,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-inline void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -103,7 +103,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-inline void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -114,7 +114,7 @@
+     }
+ }*/
+ 
+-inline LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -134,7 +134,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-inline LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -148,7 +148,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-inline void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -160,7 +160,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-inline void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:18:09.361133006 +0100
++++ wmgeneral/list.h	2016-01-04 13:18:26.007138577 +0100
+@@ -36,20 +36,20 @@
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-inline LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-inline int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-inline void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-inline void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-inline LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-inline void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-inline LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-inline void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild b/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
index be2211c947cd..e1e7acad86ba 100644
--- a/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
+++ b/x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+inherit eutils
 
 DESCRIPTION="Password storage/retrieval in a dockapp"
 HOMEPAGE="http://sourceforge.net/projects/wmpasman/"
@@ -22,3 +23,7 @@ DEPEND="${RDEPEND}
 	>=x11-libs/libXpm-3.5.5"
 
 DOCS="BUGS ChangeLog README TODO WARNINGS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-list.patch
+}
diff --git a/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
new file mode 100644
index 000000000000..604498f3b311
--- /dev/null
+++ b/x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:22:26.492218531 +0100
++++ wmgeneral/list.c	2016-01-04 13:22:59.018229270 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:22:26.492218531 +0100
++++ wmgeneral/list.h	2016-01-04 13:22:30.028219699 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
index 4c005d642f3f..7eadfc9477cb 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,6 +36,8 @@ src_prepare() {
 
 	#Honour Gentoo LDFLAGS - bug #335986
 	sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile"
+
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch
new file mode 100644
index 000000000000..e6a77a3faf60
--- /dev/null
+++ b/x11-plugins/wmtop/files/wmtop-0.9.0-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:25:53.717286654 +0100
++++ wmgeneral/list.c	2016-01-04 13:26:06.948290980 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail) */
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero */
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned  */
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor */
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT */
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ }*/
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car */
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive) */
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST */
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:25:53.717286654 +0100
++++ wmgeneral/list.h	2016-01-04 13:25:56.934287706 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild b/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild
index 14757a5de3e3..eaeb37cfc68b 100644
--- a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.9.0-r1.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$
 
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	sed -ie "s/\$(FLAGS) -o wmtop/\$(DEBUG) \$(LDFLAGS) -D\$(OS) -o wmtop/" Makefile || die "sed failed"
 	epatch "${FILESDIR}"/${P}-meminfo.patch
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-plugins/wmtz/files/wmtz-0.7-list.patch b/x11-plugins/wmtz/files/wmtz-0.7-list.patch
new file mode 100644
index 000000000000..1b1ac317669e
--- /dev/null
+++ b/x11-plugins/wmtz/files/wmtz-0.7-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+    larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+     }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+     LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
++++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif
diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild
index 3f358630c600..fa1c2be64cc7 100644
--- a/x11-plugins/wmtz/wmtz-0.7.ebuild
+++ b/x11-plugins/wmtz/wmtz-0.7.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$
 
@@ -28,6 +28,9 @@ src_prepare() {
 
 	#Honour Gentoo LDFLAGS, see bug #337890.
 	sed -e "s/\$(FLAGS) -o wmtz/\$(LDFLAGS) -o wmtz/" -i Makefile
+
+	cd "${WORKDIR}"/${P} || die
+	epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 2ac54b5b4486..ab779cee062e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,3 +1,4 @@
 DIST xterm-314.tgz 1200426 SHA256 1dbf1e93796c1b71b22b84e82eb58bcf20a14a7f365158819f3b4dbb29fe93f0 SHA512 bce72207b6db288c3873f00b928797dfd2aaea51d183b11d377af008a1a83965bd781c648fd26d88b491197594315b2d2549cfdb44f0dbd856b269aebc31ad9f WHIRLPOOL a9eda394dc47d0d31ab27fe338e3a1d41ef581b1617d324fdb98289374e9d5e4854735ddc4a862323203ec1ecb2788f3ae7e4abe1f3b17b15dadecc6edb9f651
 DIST xterm-320.tgz 1217356 SHA256 a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7 SHA512 6c234b5564ce1276136bc3ef8ef5d6703ed9dc3af3b0fd7c8c713c0876276fc4bb55cee7137f9a8c45df66531b6bd8eb778bd7660ea35c4aa8aa80ba17ba1263 WHIRLPOOL 2d7b0de46096a7a0426a419007a590bc478d19c7e2ddc3cea2fbfe0998a2f2fe5c6f5da46b5869260207e897a284250fa2cd483d613d65636c01ce366d7b6a5c
 DIST xterm-321.tgz 1227432 SHA256 ae23b0a2c309d20a676ee05e37241c9d4ae4cd35a88e4764cb179bce3d6186d6 SHA512 a82a3abe5cb8390dd79d547831b73394d512c2f7b6fb303665a3d01870c534f3d285667856805f79af93ee7af65c102ae31430754b86b54ddac9ce5644a192d9 WHIRLPOOL 92470dfc92663435f404526e88551964b9d8de89351230c627476190c6e7e286404f55a56cd75f63fd71a59a06124dabc94895ba00e5243c7cff5a3389de70ba
+DIST xterm-322.tgz 1227531 SHA256 9adb41b53f76a3fccaa65d47a87d336094a523985d1d6a6b8cc468375ed109d6 SHA512 12641478cf35daabf45ae4edb0015e2659ca8e9849d56a93765335fc67667ab5ad5eb06c8ca5ed1b90004c22d40a6c57bb624894217b9256d1723154bf5a0c99 WHIRLPOOL bfb2ee3ec96ed9f178ef922b03b947dc2e0072a1787a2c794ac620502ceea7c7bc36d01fc7566ca1ac75dd8c3ba6776d77eadf7a92c0d8040ee39d489bf8e279
diff --git a/x11-terms/xterm/xterm-322.ebuild b/x11-terms/xterm/xterm-322.ebuild
new file mode 100644
index 000000000000..ace5d2730cb1
--- /dev/null
+++ b/x11-terms/xterm/xterm-322.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://invisible-island.net/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty toolbar truetype unicode Xaw3d"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	>=sys-libs/ncurses-5.7-r7:0=
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/kbproto
+	x11-proto/xproto"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
+	econf \
+		--libdir="${EPREFIX}"/etc \
+		--disable-full-tgetent \
+		--with-app-defaults="${DEFAULTS_DIR}" \
+		--disable-setuid \
+		--disable-setgid \
+		--with-utempter \
+		--with-x \
+		$(use_with Xaw3d) \
+		--disable-imake \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-exec-xterm \
+		$(use_enable truetype freetype) \
+		--enable-i18n \
+		--enable-load-vt-fonts \
+		--enable-logging \
+		$(use_enable openpty) \
+		$(use_enable toolbar) \
+		$(use_enable unicode mini-luit) \
+		$(use_enable unicode luit) \
+		--enable-wide-chars \
+		--enable-dabbrev \
+		--enable-warnings
+}
+
+src_install() {
+	default
+
+	dohtml xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}